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

Commit 4ee4f090 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5430508 from 7fa664b4 to qt-release 

Change-Id: I18790d629918a41cc9e64e79bbb4c13f2d542ca9
parents 323daf4b 7fa664b4

apct-tests/perftests/core/src/android/os/KernelCpuThreadReaderPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class KernelCpuThreadReaderPerfTest { 
    public final PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();



    private final KernelCpuThreadReader mKernelCpuThreadReader =

            KernelCpuThreadReader.create(8, uid -> 1000 <= uid && uid < 2000, 0);

            KernelCpuThreadReader.create(8, uid -> 1000 <= uid && uid < 2000);



    @Test

    public void timeReadCurrentProcessCpuUsage() {

apct-tests/perftests/textclassifier/AndroidTest.xml

+3 −3
Original line number Diff line number Diff line
@@ -13,16 +13,16 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs AutofillPerfTests metric instrumentation.">

<configuration description="Runs TextClassifierPerfTests metric instrumentation.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-metric-instrumentation" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="AutofillPerfTests.apk" />

        <option name="test-file-name" value="TextClassifierPerfTests.apk" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.perftests.autofill" />

        <option name="package" value="com.android.perftests.textclassifier" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>

api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -28705,12 +28705,12 @@ package android.net { 














  public static class ConnectivityManager.NetworkCallback {















    ctor public ConnectivityManager.NetworkCallback();













    method public void onAvailable(android.net.Network);













    method public void onAvailable(@NonNull android.net.Network);















    method public void onBlockedStatusChanged(@NonNull android.net.Network, boolean);













    method public void onCapabilitiesChanged(android.net.Network, android.net.NetworkCapabilities);













    method public void onLinkPropertiesChanged(android.net.Network, android.net.LinkProperties);













    method public void onLosing(android.net.Network, int);













    method public void onLost(android.net.Network);













    method public void onCapabilitiesChanged(@NonNull android.net.Network, @NonNull android.net.NetworkCapabilities);













    method public void onLinkPropertiesChanged(@NonNull android.net.Network, @NonNull android.net.LinkProperties);













    method public void onLosing(@NonNull android.net.Network, int);













    method public void onLost(@NonNull android.net.Network);















    method public void onUnavailable();















  }







































api/system-current.txt



+2
−1




























Original line number
Diff line number
Diff line








@@ -123,6 +123,7 @@ package android {













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















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















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













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















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















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















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










@@ -4158,7 +4159,7 @@ package android.net {













  }





























  public static class NetworkRequest.Builder {













    method @NonNull public android.net.NetworkRequest.Builder setSignalStrength(int);













    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkRequest.Builder setSignalStrength(int);















  }





























  public class NetworkScoreManager {

































cmds/sm/src/com/android/commands/sm/Sm.java



+0
−8




























Original line number
Diff line number
Diff line








@@ -103,8 +103,6 @@ public final class Sm {













            runSetVirtualDisk();















        } else if ("set-isolated-storage".equals(op)) {















            runIsolatedStorage();













        } else if ("set-legacy-greylist".equals(op)) {













            runLegacyGreylist();















        } else {















            throw new IllegalArgumentException();















        }










@@ -306,12 +304,6 @@ public final class Sm {













        mSm.setDebugFlags(value, mask);















    }





























    public void runLegacyGreylist() throws RemoteException {













        final boolean legacyGreylist = Boolean.parseBoolean(nextArg());













        mSm.setDebugFlags(legacyGreylist ? StorageManager.DEBUG_LEGACY_GREYLIST : 0,













                StorageManager.DEBUG_LEGACY_GREYLIST);













    }





























    public void runIdleMaint() throws RemoteException {















        final boolean im_run = "run".equals(nextArg());















        if (im_run) {