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

Commit 6bebbcd5 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Merge commit 'goog/master' into merge_master

parents 97b8056c e1a08580

Android.mk

+20 −0
Original line number Diff line number Diff line
@@ -41,6 +41,18 @@ LOCAL_SRC_FILES := $(filter-out \ 
			org/mobilecontrol/% \

			,$(LOCAL_SRC_FILES))



# Include a different set of source files when building a debug build.

# TODO: Maybe build these into a separate .jar and put it on the classpath

#       in front of framework.jar.

# NOTE: Do not use this as an example; this is a very special situation.

#       Do not modify LOCAL_SRC_FILES based on any variable other

#       than TARGET_BUILD_TYPE, otherwise builds can become inconsistent.

ifeq ($(TARGET_BUILD_TYPE),debug)

  LOCAL_SRC_FILES += $(call find-other-java-files,core/config/debug)

else

  LOCAL_SRC_FILES += $(call find-other-java-files,core/config/ndebug)

endif



## READ ME: ########################################################

##

## When updating this list of aidl files, consider if that aidl is
@@ -76,8 +88,10 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothDevice.aidl \

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

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

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

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

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

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

	core/java/android/content/pm/IPackageDataObserver.aidl \

	core/java/android/content/pm/IPackageDeleteObserver.aidl \

	core/java/android/content/pm/IPackageInstallObserver.aidl \
@@ -119,6 +133,7 @@ LOCAL_SRC_FILES += \ 
	im/java/android/im/IImPlugin.aidl \

	location/java/android/location/IGeocodeProvider.aidl \

	location/java/android/location/IGpsStatusListener.aidl \

	location/java/android/location/IGpsStatusProvider.aidl \

	location/java/android/location/ILocationCollector.aidl \

	location/java/android/location/ILocationListener.aidl \

	location/java/android/location/ILocationManager.aidl \
@@ -235,6 +250,11 @@ fwbase_dirs_to_document := \ 
	   ) \

	 )



# Pass a special "fake-out" version of some classes to the doc/API tools.

# ConfigBuildFlags uses this trick to prevent certain fields from appearing

# as "final" in the official SDK APIs.

fwbase_dirs_to_document += core/config/sdk



# These are relative to dalvik/libcore

# Intentionally not included from libcore:

#     icu openssl suncompat support

api/4.xml

0 → 100644
+335194 −0

File added.

Preview size limit exceeded, changes collapsed.

api/current.xml

+448 −214
Original line number Diff line number Diff line
@@ -529,6 +529,28 @@ 
 visibility="public"

>

</field>

<field name="INSTALL_LOCATION_COLLECTOR"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_LOCATION_PROVIDER"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PACKAGES"

 type="java.lang.String"

 transient="false"
@@ -1575,7 +1597,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843373"

 value="16843376"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -2528,6 +2550,17 @@ 
 visibility="public"

>

</field>

<field name="contentAuthority"

 type="int"

 transient="false"

 volatile="false"

 value="16843377"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="cropToPadding"

 type="int"

 transient="false"
@@ -3925,6 +3958,17 @@ 
 visibility="public"

>

</field>

<field name="includeInGlobalSearch"

 type="int"

 transient="false"

 volatile="false"

 value="16843374"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="indeterminate"

 type="int"

 transient="false"
@@ -5344,6 +5388,17 @@ 
 visibility="public"

>

</field>

<field name="onClick"

 type="int"

 transient="false"

 volatile="false"

 value="16843375"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="oneshot"

 type="int"

 transient="false"
@@ -6455,6 +6510,17 @@ 
 visibility="public"

>

</field>

<field name="searchSuggestThreshold"

 type="int"

 transient="false"

 volatile="false"

 value="16843373"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="secondaryProgress"

 type="int"

 transient="false"
@@ -12848,123 +12914,6 @@ 
</parameter>

</method>

</class>

<class name="AccountAuthenticatorCache"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="AccountAuthenticatorCache"

 type="android.accounts.AccountAuthenticatorCache"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</constructor>

<method name="close"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="dump"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="fd" type="java.io.FileDescriptor">

</parameter>

<parameter name="fout" type="java.io.PrintWriter">

</parameter>

<parameter name="args" type="java.lang.String[]">

</parameter>

</method>

<method name="getAllAuthenticators"

 return="java.util.Collection&lt;android.accounts.AccountAuthenticatorCache.AuthenticatorInfo&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getAuthenticatorInfo"

 return="android.accounts.AccountAuthenticatorCache.AuthenticatorInfo"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="parseAuthenticatorInfo"

 return="android.accounts.AccountAuthenticatorCache.AuthenticatorInfo"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="service" type="android.content.pm.ResolveInfo">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException">

</exception>

</method>

</class>

<class name="AccountAuthenticatorCache.AuthenticatorInfo"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<field name="mComponentName"

 type="android.content.ComponentName"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mType"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="AccountAuthenticatorResponse"

 extends="java.lang.Object"

 abstract="false"
@@ -13784,93 +13733,6 @@ 
</parameter>

</method>

</class>

<class name="AuthenticatorBindHelper"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="AuthenticatorBindHelper"

 type="android.accounts.AuthenticatorBindHelper"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="authenticatorCache" type="android.accounts.AccountAuthenticatorCache">

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</constructor>

<method name="bind"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="callback" type="android.accounts.AuthenticatorBindHelper.Callback">

</parameter>

</method>

<method name="unbind"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callbackToUnbind" type="android.accounts.AuthenticatorBindHelper.Callback">

</parameter>

</method>

</class>

<interface name="AuthenticatorBindHelper.Callback"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onConnected"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="onDisconnected"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</interface>

<class name="AuthenticatorException"

 extends="java.lang.Exception"

 abstract="false"
@@ -25041,6 +24903,187 @@ 
</parameter>

</method>

</class>

<class name="ContentProviderClient"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="bulkInsert"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="initialValues" type="android.content.ContentValues[]">

</parameter>

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

</exception>

</method>

<method name="delete"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

<parameter name="selectionArgs" type="java.lang.String[]">

</parameter>

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

</exception>

</method>

<method name="getLocalContentProvider"

 return="android.content.ContentProvider"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getType"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</exception>

</method>

<method name="insert"

 return="android.net.Uri"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="initialValues" type="android.content.ContentValues">

</parameter>

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

</exception>

</method>

<method name="openAssetFile"

 return="android.content.res.AssetFileDescriptor"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

<exception name="FileNotFoundException" type="java.io.FileNotFoundException">

</exception>

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

</exception>

</method>

<method name="openFile"

 return="android.os.ParcelFileDescriptor"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

<exception name="FileNotFoundException" type="java.io.FileNotFoundException">

</exception>

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

</exception>

</method>

<method name="query"

 return="android.database.Cursor"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="projection" type="java.lang.String[]">

</parameter>

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

</parameter>

<parameter name="selectionArgs" type="java.lang.String[]">

</parameter>

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

</parameter>

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

</exception>

</method>

<method name="release"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="update"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="values" type="android.content.ContentValues">

</parameter>

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

</parameter>

<parameter name="selectionArgs" type="java.lang.String[]">

</parameter>

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

</exception>

</method>

</class>

<class name="ContentQueryMap"

 extends="java.util.Observable"

 abstract="false"
@@ -25143,6 +25186,32 @@ 
<parameter name="context" type="android.content.Context">

</parameter>

</constructor>

<method name="acquireContentProviderClient"

 return="android.content.ContentProviderClient"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="acquireContentProviderClient"

 return="android.content.ContentProviderClient"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="bulkInsert"

 return="int"

 abstract="false"
@@ -33095,6 +33164,47 @@ 
</parameter>

</method>

</interface>

<class name="SyncAdapterType"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="SyncAdapterType"

 type="android.content.SyncAdapterType"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</constructor>

<field name="accountType"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="authority"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="UriMatcher"

 extends="java.lang.Object"

 abstract="false"
@@ -36787,7 +36897,7 @@ 
 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -65837,7 +65947,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="mode" type="int">
@@ -66048,7 +66158,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="mode" type="int">
@@ -70764,6 +70874,17 @@ 
 visibility="public"

>

</field>

<field name="TONE_SUP_CONFIRM"

 type="int"

 transient="false"

 volatile="false"

 value="32"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_SUP_CONGESTION"

 type="int"

 transient="false"
@@ -70775,6 +70896,17 @@ 
 visibility="public"

>

</field>

<field name="TONE_SUP_CONGESTION_ABBREV"

 type="int"

 transient="false"

 volatile="false"

 value="31"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_SUP_DIAL"

 type="int"

 transient="false"
@@ -70797,6 +70929,39 @@ 
 visibility="public"

>

</field>

<field name="TONE_SUP_INTERCEPT"

 type="int"

 transient="false"

 volatile="false"

 value="29"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_SUP_INTERCEPT_ABBREV"

 type="int"

 transient="false"

 volatile="false"

 value="30"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_SUP_PIP"

 type="int"

 transient="false"

 volatile="false"

 value="33"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_SUP_RADIO_ACK"

 type="int"

 transient="false"
@@ -94437,6 +94602,19 @@ 
 visibility="public"

>

</method>

<method name="getBroadcastCookie"

 return="java.lang.Object"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="getBroadcastItem"

 return="E"

 abstract="false"
@@ -94474,6 +94652,21 @@ 
<parameter name="callback" type="E">

</parameter>

</method>

<method name="onCallbackDied"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="E">

</parameter>

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

</parameter>

</method>

<method name="register"

 return="boolean"

 abstract="false"
@@ -94487,6 +94680,21 @@ 
<parameter name="callback" type="E">

</parameter>

</method>

<method name="register"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="E">

</parameter>

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

</parameter>

</method>

<method name="unregister"

 return="boolean"

 abstract="false"
@@ -127786,7 +127994,6 @@ 
 type="boolean"

 transient="false"

 volatile="false"

 value="false"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -127800,7 +128007,7 @@ 
 value="true"

 static="true"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -127811,7 +128018,7 @@ 
 value="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -127822,7 +128029,7 @@ 
 value="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -127830,10 +128037,9 @@ 
 type="boolean"

 transient="false"

 volatile="false"

 value="true"

 static="true"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -138060,6 +138266,19 @@ 
 visibility="public"

>

</method>

<method name="getTag"

 return="java.lang.Object"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="getTop"

 return="int"

 abstract="false"
@@ -139959,6 +140178,21 @@ 
<parameter name="tag" type="java.lang.Object">

</parameter>

</method>

<method name="setTag"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="setTouchDelegate"

 return="void"

 abstract="false"

core/config/README.txt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
One of the subdirectories {debug, ndebug} is included in framework.jar

by ../../Android.mk depending on the value of $(TARGET_BUILD_TYPE).



The sdk/ directory contains the files that are passed to the doc/API

tools regardless of $(TARGET_BUILD_TYPE).

core/config/debug/android/util/ConfigBuildFlags.java

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.util;



/**

 * Static flags set by the build process.

 */

/* package */ final class ConfigBuildFlags {

    /* package */ static final boolean DEBUG = true;

}