Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef083ec0 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Work on issue #3062691: GPS enable bypass via... 

Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
parents 1ae32bfe 043fcd98

core/java/android/content/SyncStorageEngine.java

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class SyncStorageEngine extends Handler { 


    public static final long NOT_IN_BACKOFF_MODE = -1;



    private static final Intent SYNC_CONNECTION_SETTING_CHANGED_INTENT =

    public static final Intent SYNC_CONNECTION_SETTING_CHANGED_INTENT =

            new Intent("com.android.sync.SYNC_CONN_STATUS_CHANGED");



    // TODO: i18n -- grab these out of resources.

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

+16 −11
Original line number Diff line number Diff line
@@ -38,9 +38,11 @@ import android.text.TextUtils; 
import android.text.format.Time;

import android.util.EventLog;

import android.util.Slog;

import android.util.TimeUtils;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Collections;
@@ -456,25 +458,28 @@ class AlarmManagerService extends IAlarmManager.Stub { 
        synchronized (mLock) {

            pw.println("Current Alarm Manager state:");

            if (mRtcWakeupAlarms.size() > 0 || mRtcAlarms.size() > 0) {

                final long now = System.currentTimeMillis();

                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

                pw.println(" ");

                pw.print("  Realtime wakeup (now=");

                        pw.print(System.currentTimeMillis()); pw.println("):");

                        pw.print(sdf.format(new Date(now))); pw.println("):");

                if (mRtcWakeupAlarms.size() > 0) {

                    dumpAlarmList(pw, mRtcWakeupAlarms, "  ", "RTC_WAKEUP");

                    dumpAlarmList(pw, mRtcWakeupAlarms, "  ", "RTC_WAKEUP", now);

                }

                if (mRtcAlarms.size() > 0) {

                    dumpAlarmList(pw, mRtcAlarms, "  ", "RTC");

                    dumpAlarmList(pw, mRtcAlarms, "  ", "RTC", now);

                }

            }

            if (mElapsedRealtimeWakeupAlarms.size() > 0 || mElapsedRealtimeAlarms.size() > 0) {

                final long now = SystemClock.elapsedRealtime();

                pw.println(" ");

                pw.print("  Elapsed realtime wakeup (now=");

                        pw.print(SystemClock.elapsedRealtime()); pw.println("):");

                        TimeUtils.formatDuration(now, pw); pw.println("):");

                if (mElapsedRealtimeWakeupAlarms.size() > 0) {

                    dumpAlarmList(pw, mElapsedRealtimeWakeupAlarms, "  ", "ELAPSED_WAKEUP");

                    dumpAlarmList(pw, mElapsedRealtimeWakeupAlarms, "  ", "ELAPSED_WAKEUP", now);

                }

                if (mElapsedRealtimeAlarms.size() > 0) {

                    dumpAlarmList(pw, mElapsedRealtimeAlarms, "  ", "ELAPSED");

                    dumpAlarmList(pw, mElapsedRealtimeAlarms, "  ", "ELAPSED", now);

                }

            }
@@ -499,12 +504,13 @@ class AlarmManagerService extends IAlarmManager.Stub { 
        }

    }



    private static final void dumpAlarmList(PrintWriter pw, ArrayList<Alarm> list, String prefix, String label) {

    private static final void dumpAlarmList(PrintWriter pw, ArrayList<Alarm> list,

            String prefix, String label, long now) {

        for (int i=list.size()-1; i>=0; i--) {

            Alarm a = list.get(i);

            pw.print(prefix); pw.print(label); pw.print(" #"); pw.print(i);

                    pw.print(": "); pw.println(a);

            a.dump(pw, prefix + "  ");

            a.dump(pw, prefix + "  ", now);

        }

    }
@@ -619,10 +625,9 @@ class AlarmManagerService extends IAlarmManager.Stub { 
            return sb.toString();

        }



        public void dump(PrintWriter pw, String prefix)

        {

        public void dump(PrintWriter pw, String prefix, long now) {

            pw.print(prefix); pw.print("type="); pw.print(type);

                    pw.print(" when="); pw.print(when);

                    pw.print(" when="); TimeUtils.formatDuration(when, now, pw);

                    pw.print(" repeatInterval="); pw.print(repeatInterval);

                    pw.print(" count="); pw.println(count);

            pw.print(prefix); pw.print("operation="); pw.println(operation);

services/java/com/android/server/am/BroadcastRecord.java

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ class BroadcastRecord extends Binder { 
                pw.print(prefix); pw.print("extras: "); pw.println(bundle.toString());

            }

        }

        pw.print(prefix); pw.print("caller="); pw.print(callerPackage); pw.println(" ");

                pw.println(callerApp != null ? callerApp.toShortString() : "null");

        pw.print(prefix); pw.print("caller="); pw.print(callerPackage); pw.print(" ");

                pw.print(callerApp != null ? callerApp.toShortString() : "null");

                pw.print(" pid="); pw.print(callingPid);

                pw.print(" uid="); pw.println(callingUid);

        if (requiredPermission != null) {