Compilation fixes (150d8807) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageUserState.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;

		import android.util.ArraySet;

		import java.util.HashSet;

		/**
		* Per-user state information about a package.
		@@ -36,10 +35,10 @@ public class PackageUserState {

		public String lastDisableAppCaller;

		public HashSet<String> disabledComponents;
		public HashSet<String> enabledComponents;
		public HashSet<String> protectedComponents;
		public HashSet<String> visibleComponents;
		public ArraySet<String> disabledComponents;
		public ArraySet<String> enabledComponents;
		public ArraySet<String> protectedComponents;
		public ArraySet<String> visibleComponents;

		public PackageUserState() {
		installed = true;
		@@ -55,13 +54,13 @@ public class PackageUserState {
		hidden = o.hidden;
		lastDisableAppCaller = o.lastDisableAppCaller;
		disabledComponents = o.disabledComponents != null
		? new HashSet<String>(o.disabledComponents) : null;
		? new ArraySet<String>(o.disabledComponents) : null;
		enabledComponents = o.enabledComponents != null
		? new HashSet<String>(o.enabledComponents) : null;
		? new ArraySet<String>(o.enabledComponents) : null;
		blockUninstall = o.blockUninstall;
		protectedComponents = o.protectedComponents != null
		? new HashSet<String>(o.protectedComponents) : null;
		? new ArraySet<String>(o.protectedComponents) : null;
		visibleComponents = o.visibleComponents != null
		? new HashSet<String>(o.visibleComponents) : null;
		? new ArraySet<String>(o.visibleComponents) : null;
		}
		}

core/java/android/net/IConnectivityManager.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,9 @@ interface IConnectivityManager

		boolean requestRouteToHostAddress(int networkType, in byte[] hostAddress);

		/** Policy control over specific {@link NetworkStateTracker}. */
		void setPolicyDataEnable(int networkType, boolean enabled);

		int tether(String iface);

		int untether(String iface);

core/java/android/net/NetworkIdentity.java

+19 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ import java.util.Objects;
		*
		* @hide
		*/
		public class NetworkIdentity {
		public class NetworkIdentity implements Comparable<NetworkIdentity> {
		/**
		* When enabled, combine all {@link #mSubType} together under
		* {@link #SUBTYPE_COMBINED}.
		@@ -183,4 +183,22 @@ public class NetworkIdentity {

		return new NetworkIdentity(type, subType, subscriberId, networkId, roaming);
		}

		@Override
		public int compareTo(NetworkIdentity another) {
		int res = Integer.compare(mType, another.mType);
		if (res == 0) {
		res = Integer.compare(mSubType, another.mSubType);
		}
		if (res == 0 && mSubscriberId != null && another.mSubscriberId != null) {
		res = mSubscriberId.compareTo(another.mSubscriberId);
		}
		if (res == 0 && mNetworkId != null && another.mNetworkId != null) {
		res = mNetworkId.compareTo(another.mNetworkId);
		}
		if (res == 0) {
		res = Boolean.compare(mRoaming, another.mRoaming);
		}
		return res;
		}
		}

packages/SystemUI/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,6 @@ LOCAL_RESOURCE_DIR := \
		$(LOCAL_PATH)/res
		LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.keyguard

		include $(BUILD_PACKAGE)
		#include $(BUILD_PACKAGE)

		include $(call all-makefiles-under,$(LOCAL_PATH))
		#include $(call all-makefiles-under,$(LOCAL_PATH))

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+24 −4

Original line number	Diff line number	Diff line
		@@ -1281,7 +1281,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		launchHomeFromHotKey();
		}

		private void handleLongPressOnHome() {
		/*private void handleLongPressOnHome() {
		if (mLongPressOnHomeBehavior != LONG_PRESS_HOME_NOTHING) {
		mHomeConsumed = true;
		performHapticFeedbackLw(null, HapticFeedbackConstants.LONG_PRESS, false);
		@@ -1294,6 +1294,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		im.injectInputEvent(downEvent, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
		im.injectInputEvent(upEvent, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
		}
		}*/

		private void launchCameraAction() {
		sendCloseSystemWindows();
		@@ -1621,6 +1622,27 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}

		/**
		* Read values from config.xml that may be overridden depending on
		* the configuration of the device.
		* eg. Disable long press on home goes to recents on sw600dp.
		*/
		private void readConfigurationDependentBehaviors() {
		/*mLongPressOnHomeBehavior = mContext.getResources().getInteger(
		com.android.internal.R.integer.config_longPressOnHomeBehavior);
		if (mLongPressOnHomeBehavior < LONG_PRESS_HOME_NOTHING \|\|
		mLongPressOnHomeBehavior > LONG_PRESS_HOME_ASSIST) {
		mLongPressOnHomeBehavior = LONG_PRESS_HOME_NOTHING;
		}

		mDoubleTapOnHomeBehavior = mContext.getResources().getInteger(
		com.android.internal.R.integer.config_doubleTapOnHomeBehavior);
		if (mDoubleTapOnHomeBehavior < DOUBLE_TAP_HOME_NOTHING \|\|
		mDoubleTapOnHomeBehavior > DOUBLE_TAP_HOME_RECENT_SYSTEM_UI) {
		mDoubleTapOnHomeBehavior = LONG_PRESS_HOME_NOTHING;
		}*/
		}

		@Override
		public void setInitialDisplaySize(Display display, int width, int height, int density) {
		// This method might be called before the policy has been fully initialized
		@@ -5156,8 +5178,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mContext.sendBroadcast(new Intent(POWER_KEYDOWN_MUTE));
		}
		}
		interceptPowerKeyDown(!interactive \|\| hungUp
		\|\| mVolumeDownKeyTriggered \|\| mVolumeUpKeyTriggered);
		interceptPowerKeyDown(event, interactive);
		} else {
		interceptPowerKeyUp(event, interactive, canceled);