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

Commit 86c82225 authored by thiasB's avatar thiasB
Browse files

Merge branch 'eclair' of git@github.com:thiasB/android_frameworks_base into eclair

parents 91b12bc1 4e24ef61

api/current.xml

+196 −0
Original line number Diff line number Diff line
@@ -85805,6 +85805,16 @@ 
 visibility="public"

>

</field>

<field name="frequency"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="hiddenSSID"

 type="boolean"

 transient="false"
@@ -85815,6 +85825,16 @@ 
 visibility="public"

>

</field>

<field name="isAdhoc"

 type="boolean"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="networkId"

 type="int"

 transient="false"
@@ -85941,6 +85961,169 @@ 
>

</field>

</class>

<class name="WifiConfiguration.ChannelFrequency"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<field name="CHANNEL_1"

 type="int"

 transient="false"

 volatile="false"

 value="2412"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_10"

 type="int"

 transient="false"

 volatile="false"

 value="2457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_11"

 type="int"

 transient="false"

 volatile="false"

 value="2462"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_12"

 type="int"

 transient="false"

 volatile="false"

 value="2467"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_13"

 type="int"

 transient="false"

 volatile="false"

 value="2472"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_14"

 type="int"

 transient="false"

 volatile="false"

 value="2484"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_2"

 type="int"

 transient="false"

 volatile="false"

 value="2417"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_3"

 type="int"

 transient="false"

 volatile="false"

 value="2422"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_4"

 type="int"

 transient="false"

 volatile="false"

 value="2427"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_5"

 type="int"

 transient="false"

 volatile="false"

 value="2432"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_6"

 type="int"

 transient="false"

 volatile="false"

 value="2437"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_7"

 type="int"

 transient="false"

 volatile="false"

 value="2442"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_8"

 type="int"

 transient="false"

 volatile="false"

 value="2447"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANNEL_9"

 type="int"

 transient="false"

 volatile="false"

 value="2452"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="WifiConfiguration.GroupCipher"

 extends="java.lang.Object"

 abstract="false"
@@ -86675,6 +86858,19 @@ 
 visibility="public"

>

</method>

<method name="setAdhocMode"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="setWifiEnabled"

 return="boolean"

 abstract="false"

cmds/installd/commands.c

+5 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ int install(const char *pkgname, uid_t uid, gid_t gid) 
    char pkgdir[PKG_PATH_MAX];

    char libdir[PKG_PATH_MAX];



    LOGI("installer: dir: %s pkg: %s", pkgdir, pkgname);

    if ((uid < AID_SYSTEM) || (gid < AID_SYSTEM)) {

        LOGE("invalid uid/gid: %d %d\n", uid, gid);

        return -1;
@@ -393,7 +392,9 @@ int create_cache_path(char path[PKG_PATH_MAX], const char *src) 
        return -1;

    }



    dstlen = srclen + strlen(DALVIK_CACHE_PREFIX) + 

    const char *cache_path = strncmp(src, "/system", 7) ? DALVIK_CACHE_PREFIX : DALVIK_SYSTEM_CACHE_PREFIX;



    dstlen = srclen + strlen(cache_path) + 

        strlen(DALVIK_CACHE_POSTFIX) + 1;

    

    if (dstlen > PKG_PATH_MAX) {
@@ -401,11 +402,11 @@ int create_cache_path(char path[PKG_PATH_MAX], const char *src) 
    }



    sprintf(path,"%s%s%s",

            DALVIK_CACHE_PREFIX,

            cache_path,

            src + 1, /* skip the leading / */

            DALVIK_CACHE_POSTFIX);

    

    for(tmp = path + strlen(DALVIK_CACHE_PREFIX); *tmp; tmp++) {

    for(tmp = path + strlen(cache_path); *tmp; tmp++) {

        if (*tmp == '/') {

            *tmp = '@';

        }

cmds/installd/installd.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 


#define DALVIK_CACHE_PREFIX   "/data/dalvik-cache/"

#define DALVIK_CACHE_POSTFIX  "/classes.dex"



#define DALVIK_SYSTEM_CACHE_PREFIX "/cache/dalvik-cache/"



#define PKG_NAME_MAX  128   /* largest allowed package name */

#define PKG_PATH_MAX  256   /* max size of any path we use */

core/jni/android_net_wifi_Wifi.cpp

+0 −2
Original line number Diff line number Diff line
@@ -438,8 +438,6 @@ static jboolean android_net_wifi_setBluetoothCoexistenceScanModeCommand(JNIEnv* 


static jboolean android_net_wifi_saveConfigCommand(JNIEnv* env, jobject clazz)

{

    // Make sure we never write out a value for AP_SCAN other than 1

    (void)doBooleanCommand("AP_SCAN 1", "OK");

    return doBooleanCommand("SAVE_CONFIG", "OK");

}

core/res/res/drawable-hdpi/status_bar_background.png

+207 B (1.02 KiB)
Loading image diff...