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

Commit e746f03c authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 53686433 to master 

Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
parents 15107701 53686433

api/current.xml

+160 −0
Original line number Diff line number Diff line
@@ -93977,6 +93977,8 @@ 
>

<parameter name="uid" type="int">

</parameter>

<parameter name="ws" type="android.os.WorkSource">

</parameter>

</method>

<method name="onDisable"

 return="void"
@@ -94106,6 +94108,8 @@ 
>

<parameter name="uid" type="int">

</parameter>

<parameter name="ws" type="android.os.WorkSource">

</parameter>

</method>

<method name="onRequiresCell"

 return="boolean"
@@ -94167,6 +94171,8 @@ 
>

<parameter name="minTime" type="long">

</parameter>

<parameter name="ws" type="android.os.WorkSource">

</parameter>

</method>

<method name="onSupportsAltitude"

 return="boolean"
@@ -111503,6 +111509,19 @@ 
<parameter name="refCounted" type="boolean">

</parameter>

</method>

<method name="setWorkSource"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="ws" type="android.os.WorkSource">

</parameter>

</method>

</class>

</package>

<package name="android.opengl"
@@ -138355,6 +138374,19 @@ 
<parameter name="value" type="boolean">

</parameter>

</method>

<method name="setWorkSource"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="ws" type="android.os.WorkSource">

</parameter>

</method>

</class>

<class name="Process"

 extends="java.lang.Object"
@@ -139503,6 +139535,134 @@ 
</parameter>

</method>

</class>

<class name="WorkSource"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<constructor name="WorkSource"

 type="android.os.WorkSource"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<constructor name="WorkSource"

 type="android.os.WorkSource"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="orig" type="android.os.WorkSource">

</parameter>

</constructor>

<method name="add"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="other" type="android.os.WorkSource">

</parameter>

</method>

<method name="clear"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="diff"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="other" type="android.os.WorkSource">

</parameter>

</method>

<method name="remove"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="other" type="android.os.WorkSource">

</parameter>

</method>

<method name="set"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="other" type="android.os.WorkSource">

</parameter>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="android.os.Parcel">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<field name="CREATOR"

 type="android.os.Parcelable.Creator"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.os.storage"

>

cmds/svc/src/com/android/commands/svc/PowerCommand.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class PowerCommand extends Svc.Command { 
                            = IPowerManager.Stub.asInterface(ServiceManager.getService(Context.POWER_SERVICE));

                    try {

                        IBinder lock = new Binder();

                        pm.acquireWakeLock(PowerManager.FULL_WAKE_LOCK, lock, "svc power");

                        pm.acquireWakeLock(PowerManager.FULL_WAKE_LOCK, lock, "svc power", null);

                        pm.setStayOnSetting(val);

                        pm.releaseWakeLock(lock, 0);

                    }

core/java/android/content/SyncManager.java

+4 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.WorkSource;

import android.provider.Settings;

import android.text.format.DateUtils;

import android.text.format.Time;
@@ -129,8 +130,8 @@ public class SyncManager implements OnAccountsUpdateListener { 


    private static final int INITIALIZATION_UNBIND_DELAY_MS = 5000;



    private static final String SYNC_WAKE_LOCK_PREFIX = "SyncWakeLock";

    private static final String HANDLE_SYNC_ALARM_WAKE_LOCK = "SyncManagerHandleSyncAlarmWakeLock";

    private static final String SYNC_WAKE_LOCK_PREFIX = "*sync*";

    private static final String HANDLE_SYNC_ALARM_WAKE_LOCK = "SyncManagerHandleSyncAlarm";



    private Context mContext;
@@ -1713,6 +1714,7 @@ public class SyncManager implements OnAccountsUpdateListener { 
                Log.v(TAG, "runStateIdle: setting mActiveSyncContext to " + mActiveSyncContext);

            }

            mSyncStorageEngine.setActiveSync(mActiveSyncContext);

            mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));

            if (!activeSyncContext.bindToSyncAdapter(syncAdapterInfo)) {

                Log.e(TAG, "Bind attempt failed to " + syncAdapterInfo);

                mActiveSyncContext.close();

core/java/android/os/BatteryStats.java

+3 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ public abstract class BatteryStats implements Parcelable { 
        

        public static final byte CMD_UPDATE = 0;

        public static final byte CMD_START = 1;

        public static final byte CMD_OVERFLOW = 2;

        

        public byte cmd;
@@ -1703,6 +1704,8 @@ public abstract class BatteryStats implements Parcelable { 
                pw.print(" ");

                if (rec.cmd == HistoryItem.CMD_START) {

                    pw.println(" START");

                } else if (rec.cmd == HistoryItem.CMD_OVERFLOW) {

                    pw.println(" *OVERFLOW*");

                } else {

                    if (rec.batteryLevel < 10) pw.print("00");

                    else if (rec.batteryLevel < 100) pw.print("0");

core/java/android/os/IPowerManager.aidl

+4 −1
Original line number Diff line number Diff line
@@ -17,10 +17,13 @@ 


package android.os;



import android.os.WorkSource;



/** @hide */

interface IPowerManager

{

    void acquireWakeLock(int flags, IBinder lock, String tag);

    void acquireWakeLock(int flags, IBinder lock, String tag, in WorkSource ws);

    void updateWakeLockWorkSource(IBinder lock, in WorkSource ws);

    void goToSleep(long time);

    void goToSleepWithReason(long time, int reason);

    void releaseWakeLock(IBinder lock, int flags);