Merge "[Telephony Mainline] Telephony uses own user activity notification" (6fc64280) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -8628,7 +8628,6 @@ package android.os {
		method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getTelephonyRcsMessageServiceRegisterer();
		method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getTelephonyRegistryServiceRegisterer();
		method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getTelephonyServiceRegisterer();
		method @NonNull public android.os.TelephonyServiceManager.ServiceRegisterer getWindowServiceRegisterer();
		}

		public static class TelephonyServiceManager.ServiceNotFoundException extends java.lang.Exception {
		@@ -11957,6 +11956,7 @@ package android.telephony {
		method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);
		method public boolean needsOtaServiceProvisioning();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyUserActivity();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean);
		method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);

core/java/android/os/TelephonyServiceManager.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -226,12 +226,4 @@ public class TelephonyServiceManager {
		public ServiceRegisterer getIccPhoneBookServiceRegisterer() {
		return new ServiceRegisterer("simphonebook");
		}

		/**
		* Returns {@link ServiceRegisterer} for the window service.
		*/
		@NonNull
		public ServiceRegisterer getWindowServiceRegisterer() {
		return new ServiceRegisterer(Context.WINDOW_SERVICE);
		}
		}

services/core/java/com/android/server/power/Notifier.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import android.os.VibrationEffect;
		import android.os.Vibrator;
		import android.os.WorkSource;
		import android.provider.Settings;
		import android.telephony.TelephonyManager;
		import android.util.EventLog;
		import android.util.Slog;
		import android.util.StatsLog;
		@@ -671,6 +672,8 @@ public class Notifier {
		}
		mUserActivityPending = false;
		}
		TelephonyManager tm = mContext.getSystemService(TelephonyManager.class);
		tm.notifyUserActivity();
		mPolicy.userActivity();
		}

telephony/java/android/telephony/TelephonyManager.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -12810,4 +12810,22 @@ public class TelephonyManager {
		}
		return 0;
		}

		/**
		* Called when userActivity is signalled in the power manager.
		* This should only be called from system Uid.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public void notifyUserActivity() {
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		service.userActivity();
		}
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

telephony/java/com/android/internal/telephony/ITelephony.aidl

+11 −0

Original line number	Diff line number	Diff line
		@@ -2186,4 +2186,15 @@ interface ITelephony {
		int setIccLockEnabled(int subId, boolean enabled, String password);

		int changeIccLockPassword(int subId, String oldPassword, String newPassword);

		/**
		* Request for receiving user activity notification
		*/
		oneway void requestUserActivityNotification();

		/**
		* Called when userActivity is signalled in the power manager.
		* This is safe to call from any thread, with any window manager locks held or not.
		*/
		oneway void userActivity();
		}