Merge tag 'android-5.0.2_r1' into HEAD (7a886739) · Commits · e / os / android_frameworks_base

core/java/android/os/storage/IMountService.java

+63 −0

Original line number	Diff line number	Diff line
		@@ -856,6 +856,38 @@ public interface IMountService extends IInterface {
		}
		return _result;
		}

		@Override
		public long lastMaintenance() throws RemoteException {
		Parcel _data = Parcel.obtain();
		Parcel _reply = Parcel.obtain();
		long _result;
		try {
		_data.writeInterfaceToken(DESCRIPTOR);
		mRemote.transact(Stub.TRANSACTION_lastMaintenance, _data, _reply, 0);
		_reply.readException();
		_result = _reply.readLong();
		} finally {
		_reply.recycle();
		_data.recycle();
		}
		return _result;
		}

		@Override
		public void runMaintenance() throws RemoteException {
		Parcel _data = Parcel.obtain();
		Parcel _reply = Parcel.obtain();
		try {
		_data.writeInterfaceToken(DESCRIPTOR);
		mRemote.transact(Stub.TRANSACTION_runMaintenance, _data, _reply, 0);
		_reply.readException();
		} finally {
		_reply.recycle();
		_data.recycle();
		}
		return;
		}
		}

		private static final String DESCRIPTOR = "IMountService";
		@@ -942,6 +974,10 @@ public interface IMountService extends IInterface {

		static final int TRANSACTION_resizeSecureContainer = IBinder.FIRST_CALL_TRANSACTION + 40;

		static final int TRANSACTION_lastMaintenance = IBinder.FIRST_CALL_TRANSACTION + 41;

		static final int TRANSACTION_runMaintenance = IBinder.FIRST_CALL_TRANSACTION + 42;

		/**
		* Cast an IBinder object into an IMountService interface, generating a
		* proxy if needed.
		@@ -1347,6 +1383,19 @@ public interface IMountService extends IInterface {
		reply.writeInt(resultCode);
		return true;
		}
		case TRANSACTION_lastMaintenance: {
		data.enforceInterface(DESCRIPTOR);
		long lastMaintenance = lastMaintenance();
		reply.writeNoException();
		reply.writeLong(lastMaintenance);
		return true;
		}
		case TRANSACTION_runMaintenance: {
		data.enforceInterface(DESCRIPTOR);
		runMaintenance();
		reply.writeNoException();
		return true;
		}
		}
		return super.onTransact(code, data, reply, flags);
		}
		@@ -1617,4 +1666,18 @@ public interface IMountService extends IInterface {
		public String getField(String field) throws RemoteException;

		public int resizeSecureContainer(String id, int sizeMb, String key) throws RemoteException;

		/**
		* Report the time of the last maintenance operation such as fstrim.
		* @return Timestamp of the last maintenance operation, in the
		* System.currentTimeMillis() time base
		* @throws RemoteException
		*/
		public long lastMaintenance() throws RemoteException;

		/**
		* Kick off an immediate maintenance operation
		* @throws RemoteException
		*/
		public void runMaintenance() throws RemoteException;
		}

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -6192,6 +6192,13 @@ public final class Settings {
		*/
		public static final String PACKAGE_VERIFIER_INCLUDE_ADB = "verifier_verify_adb_installs";

		/**
		* Time since last fstrim (milliseconds) after which we force one to happen
		* during device startup. If unset, the default is 3 days.
		* @hide
		*/
		public static final String FSTRIM_MANDATORY_INTERVAL = "fstrim_mandatory_interval";

		/**
		* The interval in milliseconds at which to check packet counts on the
		* mobile data interface when screen is on, to detect possible data

core/res/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -3508,6 +3508,9 @@
		<!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
		<string name="android_upgrading_title">Android is upgrading\u2026</string>

		<!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
		<string name="android_upgrading_fstrim">Optimizing storage.</string>

		<!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
		<string name="android_upgrading_apk">Optimizing app
		<xliff:g id="number" example="123">%1$d</xliff:g> of

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1697,6 +1697,7 @@
		<java-symbol type="string" name="aerr_application" />
		<java-symbol type="string" name="aerr_process" />
		<java-symbol type="string" name="aerr_title" />
		<java-symbol type="string" name="android_upgrading_fstrim" />
		<java-symbol type="string" name="android_upgrading_apk" />
		<java-symbol type="string" name="android_upgrading_complete" />
		<java-symbol type="string" name="android_upgrading_starting_apps" />

services/core/java/com/android/server/AlarmManagerService.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -858,7 +858,7 @@ class AlarmManagerService extends SystemService {
		}

		setImpl(type, triggerAtTime, windowLength, interval, operation,
		false, workSource, alarmClock);
		windowLength == AlarmManager.WINDOW_EXACT, workSource, alarmClock);
		}

		@Override
		@@ -1585,12 +1585,9 @@ class AlarmManagerService extends SystemService {
		maxTriggerTime(nowELAPSED, nextElapsed, alarm.repeatInterval),
		alarm.repeatInterval, alarm.operation, batch.standalone, true,
		alarm.workSource, alarm.alarmClock, alarm.userId, false);
		}

		// For now we count this as a wakeup alarm, meaning it needs to be
		// delivered immediately. In the future we should change this, but
		// that required delaying when we reschedule the repeat...!
		hasWakeup = false;
		} else if (alarm.wakeup) {
		if (alarm.wakeup) {
		hasWakeup = true;
		}