Loading services/core/java/com/android/server/location/GnssVisibilityControl.java +6 −6 Original line number Diff line number Diff line Loading @@ -78,7 +78,6 @@ class GnssVisibilityControl { private final Handler mHandler; private final Context mContext; private final GpsNetInitiatedHandler mNiHandler; private final Notification mEmergencyLocationUserNotification; private boolean mIsGpsEnabled; Loading Loading @@ -107,7 +106,6 @@ class GnssVisibilityControl { mNiHandler = niHandler; mAppOps = mContext.getSystemService(AppOpsManager.class); mPackageManager = mContext.getPackageManager(); mEmergencyLocationUserNotification = createEmergencyLocationUserNotification(mContext); // Complete initialization as the first event to run in mHandler thread. After that, // all object state read/update events run in the mHandler thread. Loading Loading @@ -632,13 +630,15 @@ class GnssVisibilityControl { } notificationManager.notifyAsUser(/* tag= */ null, /* notificationId= */ 0, mEmergencyLocationUserNotification, UserHandle.ALL); createEmergencyLocationUserNotification(mContext), UserHandle.ALL); } private static Notification createEmergencyLocationUserNotification(Context context) { String firstLineText = context.getString(R.string.gpsNotifTitle); String secondLineText = context.getString(R.string.global_action_emergency); String accessibilityServicesText = firstLineText + " (" + secondLineText + ")"; // NOTE: Do not reuse the returned notification object as it will not reflect // changes to notification text when the system language is changed. final String firstLineText = context.getString(R.string.gpsNotifTitle); final String secondLineText = context.getString(R.string.global_action_emergency); final String accessibilityServicesText = firstLineText + " (" + secondLineText + ")"; return new Notification.Builder(context, SystemNotificationChannels.NETWORK_ALERTS) .setSmallIcon(com.android.internal.R.drawable.stat_sys_gps_on) .setWhen(0) Loading Loading
services/core/java/com/android/server/location/GnssVisibilityControl.java +6 −6 Original line number Diff line number Diff line Loading @@ -78,7 +78,6 @@ class GnssVisibilityControl { private final Handler mHandler; private final Context mContext; private final GpsNetInitiatedHandler mNiHandler; private final Notification mEmergencyLocationUserNotification; private boolean mIsGpsEnabled; Loading Loading @@ -107,7 +106,6 @@ class GnssVisibilityControl { mNiHandler = niHandler; mAppOps = mContext.getSystemService(AppOpsManager.class); mPackageManager = mContext.getPackageManager(); mEmergencyLocationUserNotification = createEmergencyLocationUserNotification(mContext); // Complete initialization as the first event to run in mHandler thread. After that, // all object state read/update events run in the mHandler thread. Loading Loading @@ -632,13 +630,15 @@ class GnssVisibilityControl { } notificationManager.notifyAsUser(/* tag= */ null, /* notificationId= */ 0, mEmergencyLocationUserNotification, UserHandle.ALL); createEmergencyLocationUserNotification(mContext), UserHandle.ALL); } private static Notification createEmergencyLocationUserNotification(Context context) { String firstLineText = context.getString(R.string.gpsNotifTitle); String secondLineText = context.getString(R.string.global_action_emergency); String accessibilityServicesText = firstLineText + " (" + secondLineText + ")"; // NOTE: Do not reuse the returned notification object as it will not reflect // changes to notification text when the system language is changed. final String firstLineText = context.getString(R.string.gpsNotifTitle); final String secondLineText = context.getString(R.string.global_action_emergency); final String accessibilityServicesText = firstLineText + " (" + secondLineText + ")"; return new Notification.Builder(context, SystemNotificationChannels.NETWORK_ALERTS) .setSmallIcon(com.android.internal.R.drawable.stat_sys_gps_on) .setWhen(0) Loading