mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
Churn
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
974878988b
commit
877257692e
@ -50,7 +50,7 @@ index 8f9df8332d6a..5f3dc3716e23 100644
|
|||||||
-->
|
-->
|
||||||
<permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"
|
<permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"
|
||||||
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||||
index 3feb040b9f47..276b3db9f095 100644
|
index 3feb040b9f47..6e1c913105aa 100644
|
||||||
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||||
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||||
@@ -6153,8 +6153,20 @@ public class ActivityManagerService extends IActivityManager.Stub
|
@@ -6153,8 +6153,20 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||||
|
@ -15,10 +15,10 @@ Change-Id: I66a660c091c90a957a0fd1e144c013840db3f47e
|
|||||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||||||
index 2632be697259..27e4699d9d3c 100644
|
index 55db01aca600..1b794962eadf 100644
|
||||||
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||||||
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||||||
@@ -876,9 +876,9 @@ public class KeyguardViewMediator extends SystemUI {
|
@@ -869,9 +869,9 @@ public class KeyguardViewMediator extends SystemUI {
|
||||||
final ContentResolver cr = mContext.getContentResolver();
|
final ContentResolver cr = mContext.getContentResolver();
|
||||||
|
|
||||||
// From SecuritySettings
|
// From SecuritySettings
|
||||||
@ -30,7 +30,7 @@ index 2632be697259..27e4699d9d3c 100644
|
|||||||
|
|
||||||
// From DevicePolicyAdmin
|
// From DevicePolicyAdmin
|
||||||
final long policyTimeout = mLockPatternUtils.getDevicePolicyManager()
|
final long policyTimeout = mLockPatternUtils.getDevicePolicyManager()
|
||||||
@@ -890,8 +890,8 @@ public class KeyguardViewMediator extends SystemUI {
|
@@ -883,8 +883,8 @@ public class KeyguardViewMediator extends SystemUI {
|
||||||
timeout = lockAfterTimeout;
|
timeout = lockAfterTimeout;
|
||||||
} else {
|
} else {
|
||||||
// From DisplaySettings
|
// From DisplaySettings
|
||||||
@ -41,7 +41,7 @@ index 2632be697259..27e4699d9d3c 100644
|
|||||||
|
|
||||||
// policy in effect. Make sure we don't go beyond policy limit.
|
// policy in effect. Make sure we don't go beyond policy limit.
|
||||||
displayTimeout = Math.max(displayTimeout, 0); // ignore negative values
|
displayTimeout = Math.max(displayTimeout, 0); // ignore negative values
|
||||||
@@ -1721,7 +1721,10 @@ public class KeyguardViewMediator extends SystemUI {
|
@@ -1713,7 +1713,10 @@ public class KeyguardViewMediator extends SystemUI {
|
||||||
private void playSound(int soundId) {
|
private void playSound(int soundId) {
|
||||||
if (soundId == 0) return;
|
if (soundId == 0) return;
|
||||||
final ContentResolver cr = mContext.getContentResolver();
|
final ContentResolver cr = mContext.getContentResolver();
|
||||||
|
@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission.
|
|||||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||||
|
|
||||||
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||||
index 2953c71d5a26..919682207082 100644
|
index b4e2e2b9cac9..46da8b379721 100644
|
||||||
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||||
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||||
@@ -5010,12 +5010,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
@@ -5009,12 +5009,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,10 +14,10 @@ Change-Id: I670198b213abb2cb29a9865eb9d1e897700508b4
|
|||||||
2 files changed, 24 insertions(+)
|
2 files changed, 24 insertions(+)
|
||||||
|
|
||||||
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
|
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
|
||||||
index 107becdfbcff..b5e9a7839df0 100644
|
index 8f0b36cf2a87..8da2611d3fe9 100644
|
||||||
--- a/core/java/android/app/Notification.java
|
--- a/core/java/android/app/Notification.java
|
||||||
+++ b/core/java/android/app/Notification.java
|
+++ b/core/java/android/app/Notification.java
|
||||||
@@ -2450,6 +2450,10 @@ public class Notification implements Parcelable
|
@@ -2451,6 +2451,10 @@ public class Notification implements Parcelable
|
||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
public void visitUris(@NonNull Consumer<Uri> visitor) {
|
public void visitUris(@NonNull Consumer<Uri> visitor) {
|
||||||
|
@ -49,7 +49,7 @@ index ede05943772e..b2f8ac8cb0ec 100644
|
|||||||
new Parcelable.Creator<ParcelableConference> () {
|
new Parcelable.Creator<ParcelableConference> () {
|
||||||
@Override
|
@Override
|
||||||
diff --git a/telecomm/java/android/telecom/StatusHints.java b/telecomm/java/android/telecom/StatusHints.java
|
diff --git a/telecomm/java/android/telecom/StatusHints.java b/telecomm/java/android/telecom/StatusHints.java
|
||||||
index 762c93a49022..b7346331dc60 100644
|
index 762c93a49022..761eab81eb62 100644
|
||||||
--- a/telecomm/java/android/telecom/StatusHints.java
|
--- a/telecomm/java/android/telecom/StatusHints.java
|
||||||
+++ b/telecomm/java/android/telecom/StatusHints.java
|
+++ b/telecomm/java/android/telecom/StatusHints.java
|
||||||
@@ -16,14 +16,19 @@
|
@@ -16,14 +16,19 @@
|
||||||
|
@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission.
|
|||||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||||
|
|
||||||
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||||
index b3d3b4da94b1..5e755feed7b2 100644
|
index 07dab575e476..1f3452d1b0b3 100644
|
||||||
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||||
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||||
@@ -5239,12 +5239,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
@@ -5269,12 +5269,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ Ported from 10: 5e2898e9d21dd6802bb0b0139e7e496c41e1cd80
|
|||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
||||||
index 9bb5aecdac8f..13c77bf16ef6 100644
|
index eb64db7493cc..31b960716b4b 100644
|
||||||
--- a/core/res/AndroidManifest.xml
|
--- a/core/res/AndroidManifest.xml
|
||||||
+++ b/core/res/AndroidManifest.xml
|
+++ b/core/res/AndroidManifest.xml
|
||||||
@@ -1608,7 +1608,7 @@
|
@@ -1608,7 +1608,7 @@
|
||||||
|
@ -29,7 +29,7 @@ index 952ccdad992c..728c0e95ca6d 100644
|
|||||||
field public static final String SENSORS = "android.permission-group.SENSORS";
|
field public static final String SENSORS = "android.permission-group.SENSORS";
|
||||||
field public static final String SMS = "android.permission-group.SMS";
|
field public static final String SMS = "android.permission-group.SMS";
|
||||||
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
||||||
index 13c77bf16ef6..504cb3732f49 100644
|
index 31b960716b4b..ab7c75c937a6 100644
|
||||||
--- a/core/res/AndroidManifest.xml
|
--- a/core/res/AndroidManifest.xml
|
||||||
+++ b/core/res/AndroidManifest.xml
|
+++ b/core/res/AndroidManifest.xml
|
||||||
@@ -1602,10 +1602,18 @@
|
@@ -1602,10 +1602,18 @@
|
||||||
|
@ -55,7 +55,7 @@ index 57f8a713ec13..c63fea6e3e0e 100644
|
|||||||
android.os.Build.VERSION_CODES.DONUT, 0),
|
android.os.Build.VERSION_CODES.DONUT, 0),
|
||||||
new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,
|
new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,
|
||||||
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
||||||
index 504cb3732f49..e6d8b6cda74e 100644
|
index ab7c75c937a6..6ba699e6d9ac 100644
|
||||||
--- a/core/res/AndroidManifest.xml
|
--- a/core/res/AndroidManifest.xml
|
||||||
+++ b/core/res/AndroidManifest.xml
|
+++ b/core/res/AndroidManifest.xml
|
||||||
@@ -1392,6 +1392,18 @@
|
@@ -1392,6 +1392,18 @@
|
||||||
|
@ -55,7 +55,7 @@ index cf0607449054..7bf662b86a52 100644
|
|||||||
<protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />
|
<protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />
|
||||||
<protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />
|
<protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />
|
||||||
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||||||
index 1d05a95075c0..3d86cd7ca244 100644
|
index 55ce9c76c42a..0a1b8f4efdd5 100644
|
||||||
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||||||
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||||||
@@ -163,6 +163,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
@@ -163,6 +163,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
||||||
@ -79,7 +79,7 @@ index 1d05a95075c0..3d86cd7ca244 100644
|
|||||||
/**
|
/**
|
||||||
* If the user has disabled the keyguard, then requests to exit, this is
|
* If the user has disabled the keyguard, then requests to exit, this is
|
||||||
* how we'll ultimately let them know whether it was successful. We use this
|
* how we'll ultimately let them know whether it was successful. We use this
|
||||||
@@ -783,6 +790,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
@@ -790,6 +797,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
||||||
final IntentFilter delayedActionFilter = new IntentFilter();
|
final IntentFilter delayedActionFilter = new IntentFilter();
|
||||||
delayedActionFilter.addAction(DELAYED_KEYGUARD_ACTION);
|
delayedActionFilter.addAction(DELAYED_KEYGUARD_ACTION);
|
||||||
delayedActionFilter.addAction(DELAYED_LOCK_PROFILE_ACTION);
|
delayedActionFilter.addAction(DELAYED_LOCK_PROFILE_ACTION);
|
||||||
@ -87,7 +87,7 @@ index 1d05a95075c0..3d86cd7ca244 100644
|
|||||||
mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter,
|
mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter,
|
||||||
SYSTEMUI_PERMISSION, null /* scheduler */);
|
SYSTEMUI_PERMISSION, null /* scheduler */);
|
||||||
|
|
||||||
@@ -1056,6 +1064,18 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
@@ -1063,6 +1071,18 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -106,7 +106,7 @@ index 1d05a95075c0..3d86cd7ca244 100644
|
|||||||
private void doKeyguardForChildProfilesLocked() {
|
private void doKeyguardForChildProfilesLocked() {
|
||||||
UserManager um = UserManager.get(mContext);
|
UserManager um = UserManager.get(mContext);
|
||||||
for (int profileId : um.getEnabledProfileIds(UserHandle.myUserId())) {
|
for (int profileId : um.getEnabledProfileIds(UserHandle.myUserId())) {
|
||||||
@@ -1073,6 +1093,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
@@ -1080,6 +1100,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
||||||
mDelayedProfileShowingSequence++;
|
mDelayedProfileShowingSequence++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -117,7 +117,7 @@ index 1d05a95075c0..3d86cd7ca244 100644
|
|||||||
/**
|
/**
|
||||||
* Let's us know when the device is waking up.
|
* Let's us know when the device is waking up.
|
||||||
*/
|
*/
|
||||||
@@ -1453,6 +1477,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
@@ -1461,6 +1485,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
||||||
|
|
||||||
if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen");
|
if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen");
|
||||||
showLocked(options);
|
showLocked(options);
|
||||||
@ -128,7 +128,7 @@ index 1d05a95075c0..3d86cd7ca244 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void lockProfile(int userId) {
|
private void lockProfile(int userId) {
|
||||||
@@ -1616,6 +1644,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
@@ -1624,6 +1652,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -141,7 +141,7 @@ index 1d05a95075c0..3d86cd7ca244 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -2047,6 +2081,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
@@ -2058,6 +2092,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
|
||||||
mHideAnimationRun = false;
|
mHideAnimationRun = false;
|
||||||
adjustStatusBarLocked();
|
adjustStatusBarLocked();
|
||||||
sendUserPresentBroadcast();
|
sendUserPresentBroadcast();
|
||||||
|
Loading…
Reference in New Issue
Block a user