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

Commit 729340c7 authored by Eugenio's avatar Eugenio
Browse files

Merge remote branch 'upstream/eclair' into eclair

parents 350b5d84 e6d54f76

core/res/res/layout/battery_status.xml

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ 
            android:textSize="48dp"

            android:textColor="#ffffffff"

            android:gravity="center"

            android:paddingLeft="1dip"

            android:paddingBottom="1dip"

            />

    </FrameLayout>

services/java/com/android/server/PackageManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -3800,6 +3800,11 @@ class PackageManagerService extends IPackageManager.Stub { 
            a2sd = false;

        }



        /* Force A2SD if cm.a2sd.force is true */

        if (SystemProperties.getBoolean("cm.ap2sd.force", false)) {

            a2sd = true;

        }

    	

    	if (a2sd) { 		

    	    installPackageExt(packageURI, observer, flags, installerPackageName, true);

    	} else {