Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-05-07 20:22:49 -04:00
parent bc0a9f79b3
commit df398fd6f5
8 changed files with 44 additions and 25 deletions

View file

@ -55,7 +55,7 @@ index 55104b4e0ee2..5ed2807922d9 100644
<protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />
<protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" />
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 34f075d601cc..035581bd39a4 100644
index f025575623ca..8b36241ea33a 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -152,6 +152,8 @@ public class KeyguardViewMediator extends SystemUI {
@ -117,7 +117,7 @@ index 34f075d601cc..035581bd39a4 100644
/**
* Let's us know when the device is waking up.
*/
@@ -1370,6 +1394,10 @@ public class KeyguardViewMediator extends SystemUI {
@@ -1372,6 +1396,10 @@ public class KeyguardViewMediator extends SystemUI {
if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen");
showLocked(options);
@ -128,7 +128,7 @@ index 34f075d601cc..035581bd39a4 100644
}
private void lockProfile(int userId) {
@@ -1530,6 +1558,12 @@ public class KeyguardViewMediator extends SystemUI {
@@ -1535,6 +1563,12 @@ public class KeyguardViewMediator extends SystemUI {
}
}
}
@ -141,7 +141,7 @@ index 34f075d601cc..035581bd39a4 100644
}
}
};
@@ -1947,6 +1981,7 @@ public class KeyguardViewMediator extends SystemUI {
@@ -1953,6 +1987,7 @@ public class KeyguardViewMediator extends SystemUI {
mHideAnimationRun = false;
adjustStatusBarLocked();
sendUserPresentBroadcast();

View file

@ -252,7 +252,7 @@ index 1655c69cea..0beef5fc13 100644
mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;
break;
diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java
index 47c3a95c9f..5f4e0937c2 100644
index b74345170c..0cbb9d52de 100644
--- a/src/com/android/settings/network/PrivateDnsPreferenceController.java
+++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java
@@ -17,6 +17,19 @@
@ -275,7 +275,7 @@ index 47c3a95c9f..5f4e0937c2 100644
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE;
@@ -125,6 +138,58 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
@@ -128,6 +141,58 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
switch (mode) {
case PRIVATE_DNS_MODE_OFF:
return res.getString(R.string.private_dns_mode_off);