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

Commit 43ec8359 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5567188 from 60c9f480 to qt-release 

Change-Id: Ibb149dfeacd55674bcf2908403932c1072e7369a
parents 9fba5abb 60c9f480

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ package android { 
    field public static final String SET_WALLPAPER_HINTS = "android.permission.SET_WALLPAPER_HINTS";

    field public static final String SIGNAL_PERSISTENT_PROCESSES = "android.permission.SIGNAL_PERSISTENT_PROCESSES";

    field public static final String SMS_FINANCIAL_TRANSACTIONS = "android.permission.SMS_FINANCIAL_TRANSACTIONS";

    field public static final String START_VIEW_PERMISSION_USAGE = "android.permission.START_VIEW_PERMISSION_USAGE";

    field public static final String STATUS_BAR = "android.permission.STATUS_BAR";

    field public static final String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";

    field public static final String TRANSMIT_IR = "android.permission.TRANSMIT_IR";
@@ -10326,6 +10327,7 @@ package android.content { 
    field public static final String ACTION_USER_UNLOCKED = "android.intent.action.USER_UNLOCKED";

    field public static final String ACTION_VIEW = "android.intent.action.VIEW";

    field public static final String ACTION_VIEW_LOCUS = "android.intent.action.VIEW_LOCUS";

    field @RequiresPermission(android.Manifest.permission.START_VIEW_PERMISSION_USAGE) public static final String ACTION_VIEW_PERMISSION_USAGE = "android.intent.action.VIEW_PERMISSION_USAGE";

    field public static final String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";

    field @Deprecated public static final String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED";

    field public static final String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH";

core/java/android/app/JobSchedulerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class JobSchedulerImpl extends JobScheduler { 
    @Override

    public List<JobInfo> getAllPendingJobs() {

        try {

            return mBinder.getAllPendingJobs();

            return mBinder.getAllPendingJobs().getList();

        } catch (RemoteException e) {

            return null;

        }
@@ -110,7 +110,7 @@ public class JobSchedulerImpl extends JobScheduler { 
    @Override

    public List<JobSnapshot> getAllJobSnapshots() {

        try {

            return mBinder.getAllJobSnapshots();

            return mBinder.getAllJobSnapshots().getList();

        } catch (RemoteException e) {

            return null;

        }

core/java/android/app/VoiceInteractor.java

+6 −4
Original line number Diff line number Diff line
@@ -79,10 +79,10 @@ public final class VoiceInteractor { 
    /** @hide */

    public static final String KEY_KILL_SIGNAL = "key_kill_signal";



    IVoiceInteractor mInteractor;

    @Nullable IVoiceInteractor mInteractor;



    Context mContext;

    Activity mActivity;

    @Nullable Context mContext;

    @Nullable Activity mActivity;

    boolean mRetaining;



    final HandlerCaller mHandlerCaller;
@@ -999,8 +999,10 @@ public final class VoiceInteractor { 


        // destroyed now

        mInteractor = null;

        if (mActivity != null) {

            mActivity.setVoiceInteractor(null);

        }

    }



    public boolean submitRequest(Request request) {

        return submitRequest(request, null);

core/java/android/app/job/IJobScheduler.aidl

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app.job; 
import android.app.job.JobInfo;

import android.app.job.JobSnapshot;

import android.app.job.JobWorkItem;

import android.content.pm.ParceledListSlice;



 /**

  * IPC interface that supports the app-facing {@link #JobScheduler} api.
@@ -30,8 +31,8 @@ interface IJobScheduler { 
    int scheduleAsPackage(in JobInfo job, String packageName, int userId, String tag);

    void cancel(int jobId);

    void cancelAll();

    List<JobInfo> getAllPendingJobs();

    ParceledListSlice getAllPendingJobs();

    JobInfo getPendingJob(int jobId);

    List<JobInfo> getStartedJobs();

    List<JobSnapshot> getAllJobSnapshots();

    ParceledListSlice getAllJobSnapshots();

}

core/java/android/app/usage/NetworkStatsManager.java

+20 −0
Original line number Diff line number Diff line
@@ -278,6 +278,12 @@ public class NetworkStatsManager { 
            return null;

        }



        return querySummary(template, startTime, endTime);

    }



    /** @hide */

    public NetworkStats querySummary(NetworkTemplate template, long startTime,

            long endTime) throws SecurityException, RemoteException {

        NetworkStats result;

        result = new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);

        result.startSummaryEnumeration();
@@ -296,6 +302,13 @@ public class NetworkStatsManager { 
            NetworkStats.Bucket.TAG_NONE, NetworkStats.Bucket.STATE_ALL);

    }



    /** @hide */

    public NetworkStats queryDetailsForUid(NetworkTemplate template,

            long startTime, long endTime, int uid) throws SecurityException {

        return queryDetailsForUidTagState(template, startTime, endTime, uid,

                NetworkStats.Bucket.TAG_NONE, NetworkStats.Bucket.STATE_ALL);

    }



    /**

     * Query network usage statistics details for a given uid and tag.

     *
@@ -340,6 +353,13 @@ public class NetworkStatsManager { 
        NetworkTemplate template;

        template = createTemplate(networkType, subscriberId);



        return queryDetailsForUidTagState(template, startTime, endTime, uid, tag, state);

    }



    /** @hide */

    public NetworkStats queryDetailsForUidTagState(NetworkTemplate template,

            long startTime, long endTime, int uid, int tag, int state) throws SecurityException {



        NetworkStats result;

        try {

            result = new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);