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

Commit f73bbd04 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Merge commit 'goog/master' into merge_master

parents 6edf5af5 aba6af92

Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IAlarmManager.aidl \

        core/java/android/app/IBackupAgent.aidl \

	core/java/android/app/IInstrumentationWatcher.aidl \

	core/java/android/app/IIntentReceiver.aidl \

	core/java/android/app/IIntentSender.aidl \

	core/java/android/app/INotificationManager.aidl \

	core/java/android/app/ISearchManager.aidl \

	core/java/android/app/ISearchManagerCallback.aidl \
@@ -92,6 +90,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothDevice.aidl \

	core/java/android/bluetooth/IBluetoothHeadset.aidl \

        core/java/android/content/IContentService.aidl \

	core/java/android/content/IIntentReceiver.aidl \

	core/java/android/content/IIntentSender.aidl \

	core/java/android/content/ISyncAdapter.aidl \

	core/java/android/content/ISyncContext.aidl \

        core/java/android/content/ISyncStatusObserver.aidl \
@@ -203,6 +203,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/app/PendingIntent.aidl \

	frameworks/base/core/java/android/content/ComponentName.aidl \

	frameworks/base/core/java/android/content/Intent.aidl \

	frameworks/base/core/java/android/content/IntentSender.aidl \

	frameworks/base/core/java/android/content/SyncStats.aidl \

	frameworks/base/core/java/android/content/res/Configuration.aidl \

	frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \

api/current.xml

+424 −56
Original line number Diff line number Diff line
@@ -25161,6 +25161,17 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="getIntentSender"

 return="android.content.IntentSender"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getService"

 return="android.app.PendingIntent"

 abstract="false"
@@ -30524,6 +30535,17 @@ 
 visibility="public"

>

</method>

<method name="getApplicationInfo"

 return="android.content.pm.ApplicationInfo"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getAssets"

 return="android.content.res.AssetManager"

 abstract="true"
@@ -31887,6 +31909,17 @@ 
 visibility="public"

>

</method>

<method name="getApplicationInfo"

 return="android.content.pm.ApplicationInfo"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getAssets"

 return="android.content.res.AssetManager"

 abstract="false"
@@ -32882,6 +32915,70 @@ 
</exception>

</method>

</interface>

<interface name="IIntentReceiver"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</implements>

<method name="performReceive"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="intent" type="android.content.Intent">

</parameter>

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

</parameter>

<parameter name="data" type="java.lang.String">

</parameter>

<parameter name="extras" type="android.os.Bundle">

</parameter>

<parameter name="ordered" type="boolean">

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

</interface>

<interface name="IIntentSender"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</implements>

<method name="send"

 return="int"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="intent" type="android.content.Intent">

</parameter>

<parameter name="resolvedType" type="java.lang.String">

</parameter>

<parameter name="finishedReceiver" type="android.content.IIntentReceiver">

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

</interface>

<class name="Intent"

 extends="java.lang.Object"

 abstract="false"
@@ -33364,7 +33461,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="uri" type="java.lang.String">
@@ -33415,6 +33512,17 @@ 
<parameter name="defaultValue" type="long">

</parameter>

</method>

<method name="getPackage"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getParcelableArrayExtra"

 return="android.os.Parcelable[]"

 abstract="false"
@@ -33614,6 +33722,23 @@ 
<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException">

</exception>

</method>

<method name="parseUri"

 return="android.content.Intent"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="java.lang.String">

</parameter>

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

</parameter>

<exception name="URISyntaxException" type="java.net.URISyntaxException">

</exception>

</method>

<method name="putExtra"

 return="android.content.Intent"

 abstract="false"
@@ -34287,6 +34412,19 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="setPackage"

 return="android.content.Intent"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

</method>

<method name="setType"

 return="android.content.Intent"

 abstract="false"
@@ -34301,6 +34439,17 @@ 
</parameter>

</method>

<method name="toURI"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="toUri"

 return="java.lang.String"

 abstract="false"

 native="false"
@@ -34310,6 +34459,8 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="writeToParcel"

 return="void"
@@ -34953,6 +35104,17 @@ 
 visibility="public"

>

</field>

<field name="ACTION_POWER_USAGE_SUMMARY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.action.POWER_USAGE_SUMMARY&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_PROVIDER_CHANGED"

 type="java.lang.String"

 transient="false"
@@ -35063,6 +35225,17 @@ 
 visibility="public"

>

</field>

<field name="ACTION_SEND_MULTIPLE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.action.SEND_MULTIPLE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_SET_WALLPAPER"

 type="java.lang.String"

 transient="false"
@@ -35700,6 +35873,17 @@ 
 visibility="public"

>

</field>

<field name="FILL_IN_PACKAGE"

 type="int"

 transient="false"

 volatile="false"

 value="16"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_ACTIVITY_BROUGHT_TO_FRONT"

 type="int"

 transient="false"
@@ -35909,6 +36093,17 @@ 
 visibility="public"

>

</field>

<field name="URI_INTENT_SCHEME"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Intent.FilterComparison"

 extends="java.lang.Object"
@@ -36923,6 +37118,190 @@ 
</parameter>

</constructor>

</class>

<class name="IntentSender"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</implements>

<constructor name="IntentSender"

 type="android.content.IntentSender"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="target" type="android.content.IIntentSender">

</parameter>

</constructor>

<constructor name="IntentSender"

 type="android.content.IntentSender"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="target" type="android.os.IBinder">

</parameter>

</constructor>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="readIntentSenderOrNullFromParcel"

 return="android.content.IntentSender"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="sendIntent"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

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

</parameter>

<parameter name="intent" type="android.content.Intent">

</parameter>

<parameter name="onFinished" type="android.content.IntentSender.OnFinished">

</parameter>

<parameter name="handler" type="android.os.Handler">

</parameter>

<exception name="IntentSender.SendIntentException" type="android.content.IntentSender.SendIntentException">

</exception>

</method>

<method name="writeIntentSenderOrNullToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="sender" type="android.content.IntentSender">

</parameter>

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

</parameter>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="out" 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>

<interface name="IntentSender.OnFinished"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onSendFinished"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="IntentSender" type="android.content.IntentSender">

</parameter>

<parameter name="intent" type="android.content.Intent">

</parameter>

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

</parameter>

<parameter name="resultData" type="java.lang.String">

</parameter>

<parameter name="resultExtras" type="android.os.Bundle">

</parameter>

</method>

</interface>

<class name="IntentSender.SendIntentException"

 extends="android.util.AndroidException"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="IntentSender.SendIntentException"

 type="android.content.IntentSender.SendIntentException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<constructor name="IntentSender.SendIntentException"

 type="android.content.IntentSender.SendIntentException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="name" type="java.lang.String">

</parameter>

</constructor>

<constructor name="IntentSender.SendIntentException"

 type="android.content.IntentSender.SendIntentException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cause" type="java.lang.Exception">

</parameter>

</constructor>

</class>

<class name="MutableContextWrapper"

 extends="android.content.ContextWrapper"

 abstract="false"
@@ -38215,6 +38594,17 @@ 
 visibility="public"

>

</field>

<field name="FLAG_SUPPORTS_LARGE_SCREENS"

 type="int"

 transient="false"

 volatile="false"

 value="512"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_SYSTEM"

 type="int"

 transient="false"
@@ -38288,16 +38678,6 @@ 
 visibility="public"

>

</field>

<field name="expandable"

 type="boolean"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="flags"

 type="int"

 transient="false"
@@ -40029,23 +40409,6 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="resolveActivity"

 return="android.content.pm.ResolveInfo"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="intent" type="android.content.Intent">

</parameter>

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

</parameter>

<parameter name="packageName" type="java.lang.String">

</parameter>

</method>

<method name="resolveContentProvider"

 return="android.content.pm.ProviderInfo"

 abstract="true"
@@ -40187,17 +40550,6 @@ 
 visibility="public"

>

</field>

<field name="GET_EXPANDABLE"

 type="int"

 transient="false"

 volatile="false"

 value="131072"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="GET_GIDS"

 type="int"

 transient="false"
@@ -109012,6 +109364,17 @@ 
 visibility="public"

>

</field>

<field name="TTS_DEFAULT_COUNTRY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;tts_default_country&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TTS_DEFAULT_LANG"

 type="java.lang.String"

 transient="false"
@@ -109056,6 +109419,17 @@ 
 visibility="public"

>

</field>

<field name="TTS_DEFAULT_VARIANT"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;tts_default_variant&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TTS_USE_DEFAULTS"

 type="java.lang.String"

 transient="false"
@@ -117589,6 +117963,17 @@ 
 visibility="public"

>

</method>

<method name="getApplicationInfo"

 return="android.content.pm.ApplicationInfo"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getAssets"

 return="android.content.res.AssetManager"

 abstract="false"
@@ -118976,23 +119361,6 @@ 
</parameter>

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

</parameter>

<parameter name="packageName" type="java.lang.String">

</parameter>

</method>

<method name="resolveActivity"

 return="android.content.pm.ResolveInfo"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="intent" type="android.content.Intent">

</parameter>

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

</parameter>

</method>

<method name="resolveContentProvider"

 return="android.content.pm.ProviderInfo"

cmds/backup/backup.cpp

+5 −24
Original line number Diff line number Diff line
@@ -64,22 +64,14 @@ perform_list(const char* filename) 
    }



    BackupDataReader reader(fd);

    bool done;

    int type;



    while (reader.ReadNextHeader(&type) == 0) {

        switch (type) {

            case BACKUP_HEADER_APP_V1:

            {

                String8 packageName;

                int cookie;

                err = reader.ReadAppHeader(&packageName, &cookie);

                if (err == 0) {

                    printf("App header: %s 0x%08x (%d)\n", packageName.string(), cookie, cookie);

                } else {

                    printf("Error reading app header\n");

                }

    while (reader.ReadNextHeader(&done, &type) == 0) {

        if (done) {

            break;

        }

        switch (type) {

            case BACKUP_HEADER_ENTITY_V1:

            {

                String8 key;
@@ -92,17 +84,6 @@ perform_list(const char* filename) 
                }

                break;

            }

            case BACKUP_FOOTER_APP_V1:

            {

                int cookie;

                err = reader.ReadAppFooter(&cookie);

                if (err == 0) {

                    printf("   App footer: 0x%08x (%d)\n", cookie, cookie);

                } else {

                    printf("   Error reading entity header\n");

                }

                break;

            }

            default:

            {

                printf("Unknown chunk type: 0x%08x\n", type);

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+70 −5
Original line number Diff line number Diff line
@@ -36,7 +36,12 @@ public final class Bmgr { 
    private String mCurArgData;



    public static void main(String[] args) {

        try {

            new Bmgr().run(args);

        } catch (Exception e) {

            System.err.println("Exception caught:");

            e.printStackTrace();

        }

    }



    public void run(String[] args) {
@@ -70,6 +75,19 @@ public final class Bmgr { 
            doList();

            return;

        }



        if ("restore".equals(op)) {

            doRestore();

            return;

        }



        if ("transport".equals(op)) {

            doTransport();

            return;

        }



        System.err.println("Unknown command");

        showUsage();

    }



    private void doRun() {
@@ -103,6 +121,19 @@ public final class Bmgr { 
        }

    }



    private void doTransport() {

        try {

            int which = Integer.parseInt(nextArg());

            int old = mBmgr.selectBackupTransport(which);

            System.out.println("Selected transport " + which + " (formerly " + old + ")");

        } catch (NumberFormatException e) {

            showUsage();

        } catch (RemoteException e) {

            System.err.println(e.toString());

            System.err.println(BMGR_NOT_RUNNING_ERR);

        }

    }



    private void doList() {

        String arg = nextArg();     // sets, transports, packages set#

        if ("transports".equals(arg)) {
@@ -114,6 +145,10 @@ public final class Bmgr { 
        try {

            int curTransport = mBmgr.getCurrentTransport();

            mRestore = mBmgr.beginRestoreSession(curTransport);

            if (mRestore == null) {

                System.err.println(BMGR_NOT_RUNNING_ERR);

                return;

            }



            if ("sets".equals(arg)) {

                doListRestoreSets();
@@ -127,13 +162,12 @@ public final class Bmgr { 
    }



    private void doListTransports() {

        

    }



    private void doListRestoreSets() {

        try {

            RestoreSet[] sets = mRestore.getAvailableRestoreSets();

            if (sets.length == 0) {

            if (sets == null || sets.length == 0) {

                System.out.println("No restore sets available");

            } else {

                for (RestoreSet s : sets) {
@@ -146,6 +180,37 @@ public final class Bmgr { 
        }

    }



    private void doRestore() {

        int token;

        try {

            token = Integer.parseInt(nextArg());

        } catch (NumberFormatException e) {

            showUsage();

            return;

        }



        try {

            int curTransport = mBmgr.getCurrentTransport();

            mRestore = mBmgr.beginRestoreSession(curTransport);

            if (mRestore == null) {

                System.err.println(BMGR_NOT_RUNNING_ERR);

                return;

            }

            RestoreSet[] sets = mRestore.getAvailableRestoreSets();

            for (RestoreSet s : sets) {

                if (s.token == token) {

                    System.out.println("Scheduling restore: " + s.name);

                    mRestore.performRestore(token);

                    break;

                }

            }

            mRestore.endRestoreSession();

        } catch (RemoteException e) {

            System.err.println(e.toString());

            System.err.println(BMGR_NOT_RUNNING_ERR);

        }

    }



    private String nextArg() {

        if (mNextArg >= mArgs.length) {

            return null;
@@ -161,7 +226,7 @@ public final class Bmgr { 
        System.err.println("       bmgr list sets");

        System.err.println("       #bmgr list transports");

        System.err.println("       #bmgr transport which#");

        System.err.println("       #bmgr restore set#");

        System.err.println("       bmgr restore token#");

        System.err.println("       bmgr run");

    }

}
 
 No newline at end of file

cmds/keystore/commands.c

+128 −42

File changed.

Preview size limit exceeded, changes collapsed.