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

Commit 11199987 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'jb-mr0-release' of... 

Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/frameworks/base into aosp-merge

Conflicts:
	packages/SystemUI/res/layout/status_bar_expanded.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	services/java/com/android/server/SystemServer.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
	telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

Change-Id: I0f435852a82b2db10a6ec804e3b829a52ba0c577
parents e4df126d 4873a480

cmds/installd/commands.c

+6 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,12 @@ int unlinklib(const char* dataDir) 
        rc = -errno;

        goto out;

    }



    if (chmod(libdir, 0755) < 0) {

        ALOGE("cannot chmod dir '%s': %s\n", libdir, strerror(errno));

        unlink(libdir);

        rc = -errno;

        goto out;

    }

    if (chown(libdir, AID_SYSTEM, AID_SYSTEM) < 0) {

        ALOGE("cannot chown dir '%s': %s\n", libdir, strerror(errno));

        unlink(libdir);

core/java/android/accessibilityservice/AccessibilityService.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ import com.android.internal.os.HandlerCaller; 
 * accessibility service. Following is an example declaration:

 * </p>

 * <pre> &lt;service android:name=".MyAccessibilityService"

 *         android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE&gt;

 *         android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"&gt;

 *     &lt;intent-filter&gt;

 *         &lt;action android:name="android.accessibilityservice.AccessibilityService" /&gt;

 *     &lt;/intent-filter&gt;

core/java/android/accounts/AccountManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ public class AccountManagerService 


        sThis.set(this);



        UserAccounts accounts = initUser(0);



        IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);

        intentFilter.addDataScheme("package");
@@ -242,6 +240,11 @@ public class AccountManagerService 
        }, userFilter);

    }



    public void systemReady() {

        mAuthenticatorCache.generateServicesMap();

        initUser(0);

    }



    private UserAccounts initUser(int userId) {

        synchronized (mUsers) {

            UserAccounts accounts = mUsers.get(userId);

core/java/android/accounts/IAccountAuthenticatorCache.java

+5 −0
Original line number Diff line number Diff line
@@ -60,4 +60,9 @@ public interface IAccountAuthenticatorCache { 
     */

    void setListener(RegisteredServicesCacheListener<AuthenticatorDescription> listener,

            Handler handler);



    /**

     * Refreshes the authenticator cache.

     */

    void generateServicesMap();

}
 
 No newline at end of file

core/java/android/app/ContextImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -368,10 +368,10 @@ class ContextImpl extends Context { 
                    return PolicyManager.makeNewLayoutInflater(ctx.getOuterContext());

                }});



        registerService(LOCATION_SERVICE, new StaticServiceFetcher() {

                public Object createStaticService() {

        registerService(LOCATION_SERVICE, new ServiceFetcher() {

                public Object createService(ContextImpl ctx) {

                    IBinder b = ServiceManager.getService(LOCATION_SERVICE);

                    return new LocationManager(ILocationManager.Stub.asInterface(b));

                    return new LocationManager(ctx, ILocationManager.Stub.asInterface(b));

                }});



        registerService(NETWORK_POLICY_SERVICE, new ServiceFetcher() {