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

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

merge master in master_gl

parents c6603951 ecf2b68d

api/current.xml

+1061 −15
Original line number Diff line number Diff line
@@ -683,6 +683,17 @@ 
 visibility="public"

>

</field>

<field name="READ_HISTORY_BOOKMARKS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.READ_HISTORY_BOOKMARKS&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="READ_INPUT_STATE"

 type="java.lang.String"

 transient="false"
@@ -1134,6 +1145,17 @@ 
 visibility="public"

>

</field>

<field name="WRITE_HISTORY_BOOKMARKS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.WRITE_HISTORY_BOOKMARKS&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WRITE_OWNER_DATA"

 type="java.lang.String"

 transient="false"
@@ -3540,17 +3562,6 @@ 
 visibility="public"

>

</field>

<field name="donut_resource_pad29"

 type="int"

 transient="false"

 volatile="false"

 value="16843395"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="donut_resource_pad3"

 type="int"

 transient="false"
@@ -3727,6 +3738,17 @@ 
 visibility="public"

>

</field>

<field name="dropDownHeight"

 type="int"

 transient="false"

 volatile="false"

 value="16843395"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="dropDownHintAppearance"

 type="int"

 transient="false"
@@ -26043,6 +26065,17 @@ 
 visibility="public"

>

</field>

<field name="USER_QUERY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;user_query&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<interface name="SearchManager.OnCancelListener"

 abstract="true"
@@ -29227,6 +29260,21 @@ 
<parameter name="name" type="java.lang.String">

</parameter>

</method>

<method name="addStatusChangeListener"

 return="java.lang.Object"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="callback" type="android.content.SyncStatusObserver">

</parameter>

</method>

<method name="applyBatch"

 return="android.content.ContentProviderResult[]"

 abstract="false"
@@ -29268,12 +29316,27 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="cancelSync"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="account" type="android.accounts.Account">

</parameter>

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

</parameter>

</method>

<method name="delete"

 return="int"

 abstract="false"
@@ -29291,6 +29354,43 @@ 
<parameter name="selectionArgs" type="java.lang.String[]">

</parameter>

</method>

<method name="getMasterSyncAutomatically"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSyncAdapterTypes"

 return="android.content.SyncAdapterType[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSyncAutomatically"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="account" type="android.accounts.Account">

</parameter>

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

</parameter>

</method>

<method name="getType"

 return="java.lang.String"

 abstract="false"
@@ -29319,6 +29419,36 @@ 
<parameter name="values" type="android.content.ContentValues">

</parameter>

</method>

<method name="isSyncActive"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="account" type="android.accounts.Account">

</parameter>

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

</parameter>

</method>

<method name="isSyncPending"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="account" type="android.accounts.Account">

</parameter>

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

</parameter>

</method>

<method name="notifyChange"

 return="void"

 abstract="false"
@@ -29491,6 +29621,66 @@ 
<parameter name="observer" type="android.database.ContentObserver">

</parameter>

</method>

<method name="removeStatusChangeListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="handle" type="java.lang.Object">

</parameter>

</method>

<method name="requestSync"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="account" type="android.accounts.Account">

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="setMasterSyncAutomatically"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="setSyncAutomatically"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="account" type="android.accounts.Account">

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="startSync"

 return="void"

 abstract="false"
@@ -29498,7 +29688,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">
@@ -29613,7 +29803,7 @@ 
 value="&quot;account&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -29640,6 +29830,17 @@ 
>

</field>

<field name="SYNC_EXTRAS_FORCE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;force&quot;"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="SYNC_EXTRAS_MANUAL"

 type="java.lang.String"

 transient="false"

 volatile="false"
@@ -37881,6 +38082,8 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

</implements>

<constructor name="SyncAdapterType"

 type="android.content.SyncAdapterType"

 static="false"
@@ -37893,6 +38096,52 @@ 
<parameter name="accountType" type="java.lang.String">

</parameter>

</constructor>

<constructor name="SyncAdapterType"

 type="android.content.SyncAdapterType"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</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="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

<field name="accountType"

 type="java.lang.String"

 transient="false"
@@ -37914,6 +38163,27 @@ 
>

</field>

</class>

<interface name="SyncStatusObserver"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onStatusChanged"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

</interface>

<class name="UriMatcher"

 extends="java.lang.Object"

 abstract="false"
@@ -50478,6 +50748,17 @@ 
 visibility="public"

>

</method>

<method name="prepareToDraw"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="recycle"

 return="void"

 abstract="false"
@@ -72988,6 +73269,21 @@ 
 visibility="public"

>

</method>

<method name="invoke"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="isLooping"

 return="boolean"

 abstract="false"
@@ -73010,6 +73306,17 @@ 
 visibility="public"

>

</method>

<method name="newRequest"

 return="android.os.Parcel"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="pause"

 return="void"

 abstract="false"
@@ -75222,6 +75529,721 @@ 
 visibility="public"

>

</field>

<field name="TONE_CDMA_ABBR_ALERT"

 type="int"

 transient="false"

 volatile="false"

 value="97"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ABBR_INTERCEPT"

 type="int"

 transient="false"

 volatile="false"

 value="37"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ABBR_REORDER"

 type="int"

 transient="false"

 volatile="false"

 value="39"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ALERT_AUTOREDIAL_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="87"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ALERT_CALL_GUARD"

 type="int"

 transient="false"

 volatile="false"

 value="93"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ALERT_INCALL_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="91"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ALERT_NETWORK_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="86"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ANSWER"

 type="int"

 transient="false"

 volatile="false"

 value="42"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALLDROP_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="95"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_INTERGROUP"

 type="int"

 transient="false"

 volatile="false"

 value="46"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_NORMAL"

 type="int"

 transient="false"

 volatile="false"

 value="45"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PAT3"

 type="int"

 transient="false"

 volatile="false"

 value="48"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PAT5"

 type="int"

 transient="false"

 volatile="false"

 value="50"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PAT6"

 type="int"

 transient="false"

 volatile="false"

 value="51"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PAT7"

 type="int"

 transient="false"

 volatile="false"

 value="52"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PING_RING"

 type="int"

 transient="false"

 volatile="false"

 value="49"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_SP_PRI"

 type="int"

 transient="false"

 volatile="false"

 value="47"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CONFIRM"

 type="int"

 transient="false"

 volatile="false"

 value="41"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_DIAL_TONE_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="34"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_EMERGENCY_RINGBACK"

 type="int"

 transient="false"

 volatile="false"

 value="92"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_L"

 type="int"

 transient="false"

 volatile="false"

 value="53"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_L"

 type="int"

 transient="false"

 volatile="false"

 value="71"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="80"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_SS"

 type="int"

 transient="false"

 volatile="false"

 value="74"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="77"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="83"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="65"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_SS"

 type="int"

 transient="false"

 volatile="false"

 value="56"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="59"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_SS_2"

 type="int"

 transient="false"

 volatile="false"

 value="62"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="68"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_INTERCEPT"

 type="int"

 transient="false"

 volatile="false"

 value="36"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_KEYPAD_VOLUME_KEY_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="89"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_L"

 type="int"

 transient="false"

 volatile="false"

 value="55"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_L"

 type="int"

 transient="false"

 volatile="false"

 value="73"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="82"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_SS"

 type="int"

 transient="false"

 volatile="false"

 value="76"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="79"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="85"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="67"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_SS"

 type="int"

 transient="false"

 volatile="false"

 value="58"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="61"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_SS_2"

 type="int"

 transient="false"

 volatile="false"

 value="64"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="70"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_L"

 type="int"

 transient="false"

 volatile="false"

 value="54"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_L"

 type="int"

 transient="false"

 volatile="false"

 value="72"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="81"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_SS"

 type="int"

 transient="false"

 volatile="false"

 value="75"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="78"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="84"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="66"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_SS"

 type="int"

 transient="false"

 volatile="false"

 value="57"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="60"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_SS_2"

 type="int"

 transient="false"

 volatile="false"

 value="63"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="69"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_NETWORK_BUSY"

 type="int"

 transient="false"

 volatile="false"

 value="40"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_NETWORK_BUSY_ONE_SHOT"

 type="int"

 transient="false"

 volatile="false"

 value="96"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_NETWORK_CALLWAITING"

 type="int"

 transient="false"

 volatile="false"

 value="43"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_NETWORK_USA_RINGBACK"

 type="int"

 transient="false"

 volatile="false"

 value="35"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ONE_MIN_BEEP"

 type="int"

 transient="false"

 volatile="false"

 value="88"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_PIP"

 type="int"

 transient="false"

 volatile="false"

 value="44"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_PRESSHOLDKEY_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="90"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_REORDER"

 type="int"

 transient="false"

 volatile="false"

 value="38"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_SIGNAL_OFF"

 type="int"

 transient="false"

 volatile="false"

 value="98"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_SOFT_ERROR_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="94"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_DTMF_0"

 type="int"

 transient="false"
@@ -116670,7 +117692,7 @@ 
>

<parameter name="uri" type="android.net.Uri">

</parameter>

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

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

</parameter>

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

</parameter>
@@ -165070,6 +166092,17 @@ 
 visibility="public"

>

</method>

<method name="getDropDownHeight"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getDropDownHorizontalOffset"

 return="int"

 abstract="false"
@@ -165341,6 +166374,19 @@ 
<parameter name="id" type="int">

</parameter>

</method>

<method name="setDropDownHeight"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="setDropDownHorizontalOffset"

 return="void"

 abstract="false"

camera/libcameraservice/CameraService.cpp

+128 −58

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/CameraService.h

+5 −0
Original line number Diff line number Diff line
@@ -194,6 +194,11 @@ private: 
                            CameraService();

    virtual                 ~CameraService();



    // We use a count for number of clients (shoule only be 0 or 1).

    volatile    int32_t                     mUsers;

    virtual     void                        incUsers();

    virtual     void                        decUsers();



    mutable     Mutex                       mLock;

                wp<Client>                  mClient;

cmds/am/src/com/android/commands/am/Am.java

+17 −2
Original line number Diff line number Diff line
@@ -26,10 +26,13 @@ import android.content.ComponentName; 
import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.view.IWindowManager;



import java.io.File;

import java.io.FileNotFoundException;

import java.util.Iterator;

import java.util.Set;
@@ -446,6 +449,8 @@ public class Am { 
            return;

        }

        

        ParcelFileDescriptor fd = null;

        

        String cmd = nextArg();

        if ("start".equals(cmd)) {

            start = true;
@@ -455,6 +460,16 @@ public class Am { 
                showUsage();

                return;

            }

            try {

                fd = ParcelFileDescriptor.open(

                        new File(profileFile),

                        ParcelFileDescriptor.MODE_CREATE |

                        ParcelFileDescriptor.MODE_TRUNCATE |

                        ParcelFileDescriptor.MODE_READ_WRITE);

            } catch (FileNotFoundException e) {

                System.err.println("Error: Unable to open file: " + profileFile);

                return;

            }

        } else if (!"stop".equals(cmd)) {

            System.err.println("Error: Profile command " + cmd + " not valid");

            showUsage();
@@ -462,8 +477,8 @@ public class Am { 
        }

        

        try {

            if (!mAm.profileControl(process, start, profileFile)) {

                System.out.println("PROFILE FAILED on process " + process);

            if (!mAm.profileControl(process, start, profileFile, fd)) {

                System.err.println("PROFILE FAILED on process " + process);

                return;

            }

        } catch (IllegalArgumentException e) {

core/java/android/app/ActivityManagerNative.java

+10 −2
Original line number Diff line number Diff line
@@ -986,7 +986,9 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            String process = data.readString();

            boolean start = data.readInt() != 0;

            String path = data.readString();

            boolean res = profileControl(process, start, path);

            ParcelFileDescriptor fd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

            boolean res = profileControl(process, start, path, fd);

            reply.writeNoException();

            reply.writeInt(res ? 1 : 0);

            return true;
@@ -2232,7 +2234,7 @@ class ActivityManagerProxy implements IActivityManager 
    }

    

    public boolean profileControl(String process, boolean start,

            String path) throws RemoteException

            String path, ParcelFileDescriptor fd) throws RemoteException

    {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();
@@ -2240,6 +2242,12 @@ class ActivityManagerProxy implements IActivityManager 
        data.writeString(process);

        data.writeInt(start ? 1 : 0);

        data.writeString(path);

        if (fd != null) {

            data.writeInt(1);

            fd.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);

        } else {

            data.writeInt(0);

        }

        mRemote.transact(PROFILE_CONTROL_TRANSACTION, data, reply, 0);

        reply.readException();

        boolean res = reply.readInt() != 0;