Android平台预置GMS包后关机闹钟失效问题及解决方法

@@ -615,8 +633,34 @@ public class AlarmManager {
  public void setAlarmClock(AlarmClockInfo info, PendingIntent operation) {
   setImpl(RTC_WAKEUP, info.getTriggerTime(), WINDOW_EXACT, 0, 0, operation,
     null, null, null, null, info);
+  setPowerOffAlarm(mContext,info.getTriggerTime());
  }
 
+
+ /*add by hxj at Aug.6,for PowerOffAlarm*/
+ private void setPowerOffAlarm(Context context, long time) {
+  Log.d(TAG, "setPowerOffAlarm: saveAlarmToPreference and sendBroadcast to setPowerOffAlarm,the time is "+time);
+  DEFAULT_ALARM_TIME = time;
+  Intent intent = new Intent(ACTION_SET_POWEROFF_ALARM);
+  intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+  intent.setPackage(POWER_OFF_ALARM_PACKAGE);
+  intent.putExtra(TIME, time);
+  context.sendBroadcast(intent);
+ }
+
+ private void cancelPowerOffAlarm(Context context) {
+  //long time = getAlarmFromPreference(context);
+  Log.d(TAG, "cancelPowerOffAlarm: cancel alarm and cancelPowerOffAlarm(mContext),time is "+DEFAULT_ALARM_TIME );
+  Intent intent = new Intent(ACTION_CANCEL_POWEROFF_ALARM);
+  intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+  intent.putExtra(TIME, DEFAULT_ALARM_TIME);
+  intent.setPackage(POWER_OFF_ALARM_PACKAGE);
+  context.sendBroadcast(intent);
+  DEFAULT_ALARM_TIME = 0L;
+ }
+
+
  /** @hide */
  @SystemApi
  @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)
@@ -930,6 +974,7 @@ public class AlarmManager {
 
   try {
    mService.remove(operation, null);
+   cancelPowerOffAlarm(mContext);
   } catch (RemoteException ex) {
    throw ex.rethrowFromSystemServer();
   }

@@ -29,7 +29,7 @@
   android:defaultToDeviceProtectedStorage="true">
 
   

@@ -42,7 +42,7 @@ public class PowerOffAlarmUtils {
 
  private static final int FAILURE = -1;
 
- public static final long MS_IN_ONE_MIN = 90000L;
+ public static final long MS_IN_ONE_MIN = 150000L;
 
  private static final long SEC_TO_MS = 1000L;