diff options
6 files changed, 2 insertions, 195 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 75df4945fbdd..657a8ea48c01 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -691,12 +691,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public int overrideDensity = 0; /** - * In case, app is whitelisted for density-overriding, set this value to 1 - * (@hide) - */ - public int whiteListed = 0; - - /** * The required smallest screen width the application can run on. If 0, * nothing has been specified. Comes from * {@link android.R.styleable#AndroidManifestSupportsScreens_requiresSmallestWidthDp @@ -1472,7 +1466,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { privateFlags = orig.privateFlags; overrideRes = orig.overrideRes; overrideDensity = orig.overrideDensity; - whiteListed = orig.whiteListed; requiresSmallestWidthDp = orig.requiresSmallestWidthDp; compatibleWidthLimitDp = orig.compatibleWidthLimitDp; largestWidthLimitDp = orig.largestWidthLimitDp; @@ -1545,7 +1538,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { dest.writeInt(privateFlags); dest.writeInt(overrideRes); dest.writeInt(overrideDensity); - dest.writeInt(whiteListed); dest.writeInt(requiresSmallestWidthDp); dest.writeInt(compatibleWidthLimitDp); dest.writeInt(largestWidthLimitDp); @@ -1623,7 +1615,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { privateFlags = source.readInt(); overrideRes = source.readInt(); overrideDensity = source.readInt(); - whiteListed = source.readInt(); requiresSmallestWidthDp = source.readInt(); compatibleWidthLimitDp = source.readInt(); largestWidthLimitDp = source.readInt(); @@ -1975,37 +1966,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { } /** @hide */ - public void setAppOverrideDensity() { - int density = 0; - String prop = SystemProperties.get("persist.vendor.qti.debug.appdensity"); - if ((prop != null) && (!prop.isEmpty())) { - density = Integer.parseInt(prop); - if ((density < DisplayMetrics.DENSITY_LOW) ||(density > DisplayMetrics.DENSITY_XXHIGH)) - density = 0; - } - setOverrideDensity(density); - } - - /** @hide */ - public void setOverrideDensity(int density) { - overrideDensity = density; - } - - /** @hide */ public int getOverrideDensity() { return overrideDensity; } - /** @hide */ - public boolean isAppWhiteListed() { - return (whiteListed == 1); - } - - /** @hide */ - public void setAppWhiteListed(int val) { - whiteListed = val; - } - /** {@hide} */ public void setCodePath(String codePath) { scanSourceDir = codePath; } /** {@hide} */ public void setBaseCodePath(String baseCodePath) { sourceDir = baseCodePath; } /** {@hide} */ public void setSplitCodePaths(String[] splitCodePaths) { splitSourceDirs = splitCodePaths; } diff --git a/core/java/com/android/internal/app/ActivityTrigger.java b/core/java/com/android/internal/app/ActivityTrigger.java index 97098fe2b87a..61d030a42522 100644 --- a/core/java/com/android/internal/app/ActivityTrigger.java +++ b/core/java/com/android/internal/app/ActivityTrigger.java @@ -39,15 +39,6 @@ public class ActivityTrigger { private static final String TAG = "ActivityTrigger"; - private static final int FLAG_OVERRIDE_RESOLUTION = 1; - private static final int FLAG_HARDWARE_ACCELERATED = - ActivityInfo.FLAG_HARDWARE_ACCELERATED; - - /*define misc. activty trigger function*/ - public static final int START_PROCESS = 1; - public static final int NETWORK_OPTS = 2; - public static final int ANIMATION_SCALE = 3; - /** @hide */ public ActivityTrigger() { //Log.d(TAG, "ActivityTrigger initialized"); @@ -61,37 +52,13 @@ public class ActivityTrigger /** @hide */ public void activityStartTrigger(Intent intent, ActivityInfo acInfo, ApplicationInfo appInfo, boolean IsInFullScreen) { + int reserved =0; ComponentName cn = intent.getComponent(); - int overrideFlags = 0; String activity = null; if(cn != null) activity = cn.flattenToString() + "/" + appInfo.versionCode; - - overrideFlags = native_at_startActivity(activity, overrideFlags); - - if((overrideFlags & FLAG_HARDWARE_ACCELERATED) != 0) { - acInfo.flags |= ActivityInfo.FLAG_HARDWARE_ACCELERATED; - } - //Overrride density only if Activity is started/resumed in fullscreen - if(IsInFullScreen) { - Log.d(TAG, "activityStartTrigger: Activity is Triggerred in full screen " - + appInfo); - if((overrideFlags & FLAG_OVERRIDE_RESOLUTION) != 0) { - Log.e(TAG, "activityStartTrigger: whiteListed " + activity + - " appInfo.flags - " + Integer.toHexString(appInfo.flags)); - appInfo.setAppOverrideDensity(); - appInfo.setAppWhiteListed(1); - } else { - appInfo.setOverrideDensity(0); - appInfo.setAppWhiteListed(0); - Log.e(TAG, "activityStartTrigger: not whiteListed" + activity); - } - } else { - Log.d(TAG, "activityStartTrigger: Activity is not Triggerred in full screen " - + appInfo); - appInfo.setOverrideDensity(0); - } + native_at_startActivity(activity, reserved); } /** @hide */ @@ -103,24 +70,6 @@ public class ActivityTrigger if (cn != null) activity = cn.flattenToString() + "/" + appInfo.versionCode; native_at_resumeActivity(activity); - - //Overrride density only if Activity is started/resumed in fullscreen - if(IsInFullScreen) { - Log.d(TAG, "activityResumeTrigger: The activity in " + appInfo + - " is now in focus and seems to be in full-screen mode"); - if(appInfo.isAppWhiteListed()) { - Log.d(TAG, "activityResumeTrigger: whiteListed " + activity + - " appInfo.flags - " + Integer.toHexString(appInfo.flags)); - appInfo.setAppOverrideDensity(); - } else { - appInfo.setOverrideDensity(0); - Log.e(TAG, "activityResumeTrigger: not whiteListed" + activity); - } - } else { - Log.d(TAG, "activityResumeTrigger: Activity is not Triggerred in full screen " - + appInfo); - appInfo.setOverrideDensity(0); - } } public void activityPauseTrigger(Intent intent, ActivityInfo acInfo, ApplicationInfo appInfo) { diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 5aa51f7e1848..c3ac53ab8d40 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -233,8 +233,6 @@ import android.graphics.Rect; import android.hardware.display.DisplayManagerInternal; import android.location.LocationManager; import android.media.audiofx.AudioEffect; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; import android.net.Proxy; import android.net.ProxyInfo; import android.net.Uri; @@ -528,10 +526,6 @@ public class ActivityManagerService extends IActivityManager.Stub private static final int NATIVE_DUMP_TIMEOUT_MS = 2000; // 2 seconds; - int mActiveNetType = -1; - Object mNetLock = new Object(); - ConnectivityManager mConnectivityManager; - /* Freq Aggr boost objects */ public static BoostFramework mPerfServiceStartHint = null; /* UX perf event object */ @@ -1350,7 +1344,6 @@ public class ActivityManagerService extends IActivityManager.Stub static final int PUSH_TEMP_WHITELIST_UI_MSG = 68; static final int SERVICE_FOREGROUND_CRASH_MSG = 69; static final int DISPATCH_OOM_ADJ_OBSERVER_MSG = 70; - static final int NETWORK_OPTS_CHECK_MSG = 88; static final int FIRST_BROADCAST_QUEUE_MSG = 200; @@ -1370,10 +1363,6 @@ public class ActivityManagerService extends IActivityManager.Stub // Enable B-service aging propagation on memory pressure. boolean mEnableBServicePropagation = SystemProperties.getBoolean("ro.vendor.qti.sys.fw.bservice_enable", false); - // Enable Net Opts - static final boolean mEnableNetOpts = - SystemProperties.getBoolean("persist.vendor.qti.netopts.enable",false); - // Process in same process Group keep in same cgroup boolean mEnableProcessGroupCgroupFollow = SystemProperties.getBoolean("ro.vendor.qti.cgroup_follow.enable",false); @@ -1730,25 +1719,6 @@ public class ActivityManagerService extends IActivityManager.Stub mProcessList.handleAllTrustStorageUpdateLocked(); } } break; - case NETWORK_OPTS_CHECK_MSG: { - int flag = msg.arg1; - String packageName = (String)msg.obj; - if (flag == 0) { - if (mActivityTrigger != null) { - synchronized (mNetLock) { - if (mActiveNetType >= 0) { - mActivityTrigger.activityMiscTrigger(ActivityTrigger.NETWORK_OPTS, - packageName, mActiveNetType, 0); - return; - } - } - } - } - if (mActivityTrigger != null) { - mActivityTrigger.activityMiscTrigger(ActivityTrigger.NETWORK_OPTS, - packageName, ConnectivityManager.TYPE_NONE, 1); - } - } break; } } }; @@ -2593,10 +2563,6 @@ public class ActivityManagerService extends IActivityManager.Stub return mAppBindArgs; } - public final void networkOptsCheck(int flag, String packageName) { - mHandler.sendMessage(mHandler.obtainMessage(NETWORK_OPTS_CHECK_MSG, flag, 0, packageName)); - } - private static void addServiceToMap(ArrayMap<String, IBinder> map, String name) { final IBinder service = ServiceManager.getService(name); if (service != null) { @@ -3337,9 +3303,6 @@ public class ActivityManagerService extends IActivityManager.Stub + ProcessList.makeOomAdjString(app.setAdj) + ProcessList.makeProcStateString(app.setProcState), app.info.uid); mAllowLowerMemLevel = true; - if (mEnableNetOpts) { - networkOptsCheck(1, app.processName); - } } else { // Note that we always want to do oom adj to update our state with the // new number of procs. @@ -4794,43 +4757,6 @@ public class ActivityManagerService extends IActivityManager.Stub } }, dumpheapFilter); - if (mEnableNetOpts) { - IntentFilter netInfoFilter = new IntentFilter(); - netInfoFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); - netInfoFilter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED); - mContext.registerReceiver(new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (mConnectivityManager != null) { - NetworkInfo netInfo = mConnectivityManager.getActiveNetworkInfo(); - synchronized(mNetLock) { - mActiveNetType = (netInfo != null) ? netInfo.getType() : -1; - } - } - ActivityStack stack = mStackSupervisor.getTopDisplayFocusedStack(); - if (stack != null) { - ActivityRecord r = stack.topRunningActivityLocked(); - if (r != null) { - PowerManager powerManager = - (PowerManager)mContext.getSystemService(Context.POWER_SERVICE); - if (powerManager != null && powerManager.isInteractive()) - networkOptsCheck(0, r.processName); - } - } - } - }, netInfoFilter); - mConnectivityManager = - (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE); - if (mConnectivityManager != null) { - NetworkInfo netInfo = mConnectivityManager.getActiveNetworkInfo(); - if (netInfo != null) { - synchronized (mNetLock) { - mActiveNetType = netInfo.getType(); - } - } - } - } - // Let system services know. mSystemServiceManager.startBootPhase(SystemService.PHASE_BOOT_COMPLETED); diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 2daeecb51430..90fdaa1b8999 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -4417,16 +4417,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D private void removeSleepTokenLocked(SleepTokenImpl token) { mSleepTokens.remove(token); - if (mService.mAm.mEnableNetOpts) { - ActivityStack stack = getTopDisplayFocusedStack(); - if (stack != null) { - ActivityRecord r = stack.topRunningActivityLocked(); - if (r != null) { - mService.mAm.networkOptsCheck(0, r.processName); - } - } - } - final ActivityDisplay display = getActivityDisplay(token.mDisplayId); if (display != null) { display.mAllSleepTokens.remove(token); diff --git a/services/core/java/com/android/server/am/ActivityTaskManagerService.java b/services/core/java/com/android/server/am/ActivityTaskManagerService.java index bef05ea5e81f..8ae5495cfa05 100644 --- a/services/core/java/com/android/server/am/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/am/ActivityTaskManagerService.java @@ -5042,15 +5042,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { ActivityTaskManagerInternal.SleepToken acquireSleepToken(String tag, int displayId) { synchronized (mGlobalLock) { final ActivityTaskManagerInternal.SleepToken token = mStackSupervisor.createSleepTokenLocked(tag, displayId); - if (mAm.mEnableNetOpts) { - ActivityStack stack = mStackSupervisor.getTopDisplayFocusedStack(); - if (stack != null) { - ActivityRecord r = stack.topRunningActivityLocked(); - if (r != null) { - mAm.networkOptsCheck(1, r.processName); - } - } - } updateSleepIfNeededLocked(); return token; } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index eff2ae001674..aa5e4e9b486b 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -229,7 +229,6 @@ import android.view.WindowManagerPolicyConstants.PointerEventListener; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.app.ActivityTrigger; import com.android.internal.os.IResultReceiver; import com.android.internal.policy.IKeyguardDismissCallback; import com.android.internal.policy.IShortcutService; @@ -279,8 +278,6 @@ public class WindowManagerService extends IWindowManager.Stub static final boolean PROFILE_ORIENTATION = false; static final boolean localLOGV = DEBUG; - static final boolean mEnableAnimCheck = SystemProperties.getBoolean("persist.vendor.qti.animcheck.enable", false); - static ActivityTrigger mActivityTrigger = new ActivityTrigger(); static WindowState mFocusingWindow; String mFocusingActivity; /** How much to multiply the policy's type layer, to reserve room @@ -3096,16 +3093,6 @@ public class WindowManagerService extends IWindowManager.Stub private float animationScalesCheck (int which) { float value = -1.0f; if (!mAnimationsDisabled) { - if (mEnableAnimCheck) { - if (mFocusingActivity != null) { - if (mActivityTrigger == null) { - mActivityTrigger = new ActivityTrigger(); - } - if (mActivityTrigger != null) { - value = mActivityTrigger.activityMiscTrigger(ActivityTrigger.ANIMATION_SCALE, mFocusingActivity, which, 0); - } - } - } if (value == -1.0f) { switch (which) { case WINDOW_ANIMATION_SCALE: value = mWindowAnimationScaleSetting; break; |