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
cd0ede5a0d
commit
3a32beaad5
@ -23,10 +23,10 @@ index 37a84f3698c1..0ae88276ebda 100644
|
||||
// one notification after enabling + one more after reboots
|
||||
static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 2;
|
||||
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
|
||||
index 392962f869b1..678322bebf6f 100644
|
||||
index b7e24889ec83..0fa78dfaf7a0 100644
|
||||
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
|
||||
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
|
||||
@@ -15859,11 +15859,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
|
||||
@@ -15896,11 +15896,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
|
||||
@Override
|
||||
public boolean isLogoutEnabled() {
|
||||
if (!mHasFeature) {
|
||||
|
@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission.
|
||||
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
|
||||
index 336433bbad89..d09291162c8d 100644
|
||||
index 77a6e9d6b658..372914a67827 100644
|
||||
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||
@@ -4482,12 +4482,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||
@@ -4510,12 +4510,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||
|
||||
ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr);
|
||||
|
||||
|
@ -10,7 +10,7 @@ Ported from 10: 5e2898e9d21dd6802bb0b0139e7e496c41e1cd80
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
||||
index cb6ef5a8f1ae..4692ddb26491 100644
|
||||
index c33437d946d8..0526ce1ef25d 100644
|
||||
--- a/core/res/AndroidManifest.xml
|
||||
+++ b/core/res/AndroidManifest.xml
|
||||
@@ -1736,7 +1736,7 @@
|
||||
@ -23,7 +23,7 @@ index cb6ef5a8f1ae..4692ddb26491 100644
|
||||
<!-- Allows applications to access information about networks.
|
||||
<p>Protection level: normal
|
||||
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
index 93cd3a988e62..03545705ae65 100644
|
||||
index ff97a3b2e4a8..6686d3750b84 100644
|
||||
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
@@ -2632,7 +2632,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
|
@ -29,7 +29,7 @@ index 1dd401d04e2b..8d0391a80193 100644
|
||||
field public static final String SENSORS = "android.permission-group.SENSORS";
|
||||
field public static final String SMS = "android.permission-group.SMS";
|
||||
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
||||
index 4692ddb26491..03bab921ca9a 100644
|
||||
index 0526ce1ef25d..f70c541c5162 100644
|
||||
--- a/core/res/AndroidManifest.xml
|
||||
+++ b/core/res/AndroidManifest.xml
|
||||
@@ -1730,10 +1730,18 @@
|
||||
|
@ -46,7 +46,7 @@ index f92c2951fdef..8f5df4672dc0 100644
|
||||
android.os.Build.VERSION_CODES.DONUT, 0),
|
||||
new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,
|
||||
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
||||
index 03bab921ca9a..b8971f77dd18 100644
|
||||
index f70c541c5162..956fd4d2427c 100644
|
||||
--- a/core/res/AndroidManifest.xml
|
||||
+++ b/core/res/AndroidManifest.xml
|
||||
@@ -1499,6 +1499,18 @@
|
||||
@ -99,7 +99,7 @@ index 27c9026c863a..4a8624222ae8 100644
|
||||
<string name="permlab_readCalendar">Read calendar events and details</string>
|
||||
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
|
||||
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
index 03545705ae65..5652a109f618 100644
|
||||
index 6686d3750b84..961d7f050e5d 100644
|
||||
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
@@ -2632,7 +2632,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
|
@ -8,7 +8,7 @@ Subject: [PATCH] extend special runtime permission implementation
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
index 41128e4c617e..93cd3a988e62 100644
|
||||
index e4653a899ddd..ff97a3b2e4a8 100644
|
||||
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
@@ -1881,7 +1881,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
@ -38,7 +38,7 @@ index 41128e4c617e..93cd3a988e62 100644
|
||||
if (DEBUG_PERMISSIONS) {
|
||||
Log.i(TAG, "Denying runtime-only permission " + bp.getName()
|
||||
+ " for package " + friendlyName);
|
||||
@@ -2934,7 +2934,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
@@ -2960,7 +2960,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
boolean restrictionApplied = (origState.getPermissionFlags(
|
||||
bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;
|
||||
|
||||
@ -47,7 +47,7 @@ index 41128e4c617e..93cd3a988e62 100644
|
||||
// If hard restricted we don't allow holding it
|
||||
if (permissionPolicyInitialized && hardRestricted) {
|
||||
if (!restrictionExempt) {
|
||||
@@ -3018,7 +3018,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
@@ -3044,7 +3044,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
if (restrictionApplied) {
|
||||
flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION;
|
||||
// Dropping restriction on a legacy app implies a review
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Danny Lin <danny@kdrag0n.dev>
|
||||
1 file changed, 20 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
index 9d0b2543e5ef..41128e4c617e 100644
|
||||
index dd8b96eab3d7..e4653a899ddd 100644
|
||||
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
@@ -1525,7 +1525,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
@ -74,7 +74,7 @@ index 9d0b2543e5ef..41128e4c617e 100644
|
||||
/**
|
||||
* Restore the permission state for a package.
|
||||
*
|
||||
@@ -2969,6 +2977,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
@@ -2995,6 +3003,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -88,7 +88,7 @@ index 9d0b2543e5ef..41128e4c617e 100644
|
||||
} else {
|
||||
if (origPermState == null) {
|
||||
// New permission
|
||||
@@ -3806,7 +3821,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
@@ -3818,7 +3833,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
if (shouldGrantPermission) {
|
||||
final int flags = getPermissionFlagsInternal(pkg.getPackageName(), permission,
|
||||
myUid, userId);
|
||||
|
@ -57,7 +57,7 @@ index cdec5a47b240..3210af7bdebc 100644
|
||||
|
||||
<protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />
|
||||
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||||
index 7ef58f5522ee..c08ec6f770a4 100644
|
||||
index 2ac75d6e8552..b419ed0d4c4a 100644
|
||||
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||||
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||||
@@ -187,6 +187,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
@ -81,7 +81,7 @@ index 7ef58f5522ee..c08ec6f770a4 100644
|
||||
/**
|
||||
* 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
|
||||
@@ -907,6 +914,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
@@ -914,6 +921,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
final IntentFilter delayedActionFilter = new IntentFilter();
|
||||
delayedActionFilter.addAction(DELAYED_KEYGUARD_ACTION);
|
||||
delayedActionFilter.addAction(DELAYED_LOCK_PROFILE_ACTION);
|
||||
@ -89,7 +89,7 @@ index 7ef58f5522ee..c08ec6f770a4 100644
|
||||
mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter,
|
||||
SYSTEMUI_PERMISSION, null /* scheduler */);
|
||||
|
||||
@@ -1208,6 +1216,18 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
@@ -1215,6 +1223,18 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
}
|
||||
}
|
||||
|
||||
@ -108,7 +108,7 @@ index 7ef58f5522ee..c08ec6f770a4 100644
|
||||
private void doKeyguardForChildProfilesLocked() {
|
||||
UserManager um = UserManager.get(mContext);
|
||||
for (int profileId : um.getEnabledProfileIds(UserHandle.myUserId())) {
|
||||
@@ -1225,6 +1245,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
@@ -1232,6 +1252,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
mDelayedProfileShowingSequence++;
|
||||
}
|
||||
|
||||
@ -119,7 +119,7 @@ index 7ef58f5522ee..c08ec6f770a4 100644
|
||||
/**
|
||||
* Let's us know when the device is waking up.
|
||||
*/
|
||||
@@ -1590,6 +1614,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
@@ -1598,6 +1622,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
|
||||
if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen");
|
||||
showLocked(options);
|
||||
@ -130,7 +130,7 @@ index 7ef58f5522ee..c08ec6f770a4 100644
|
||||
}
|
||||
|
||||
private void lockProfile(int userId) {
|
||||
@@ -1786,6 +1814,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
@@ -1794,6 +1822,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -143,7 +143,7 @@ index 7ef58f5522ee..c08ec6f770a4 100644
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -2360,6 +2394,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
@@ -2371,6 +2405,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
mHideAnimationRun = false;
|
||||
adjustStatusBarLocked();
|
||||
sendUserPresentBroadcast();
|
||||
|
Loading…
Reference in New Issue
Block a user