drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 8752 into donut

Browse Source 
* changes:
  Updates from API review.
This commit is contained in:
Android (Google) Code Review
2009-07-28 12:36:49 -07:00
parent 40c0de641a 7f2054392e
commit f0d83fd907
11 changed files with 25 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
api/current.xml
View File

@ -991,17 +991,6 @@
visibility="public"
>
</field>
<field name="SHUTDOWN"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.permission.SHUTDOWN&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SIGNAL_PERSISTENT_PROCESSES"
type="java.lang.String"
transient="false"
@ -1024,17 +1013,6 @@
visibility="public"
>
</field>
<field name="STOP_APP_SWITCHES"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.permission.STOP_APP_SWITCHES&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SUBSCRIBED_FEEDS_READ"
type="java.lang.String"
transient="false"
@ -28402,17 +28380,6 @@
visibility="public"
>
</field>
<field name="BACKUP_SERVICE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;backup&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="BIND_AUTO_CREATE"
type="int"
transient="false"
@ -29258,19 +29225,6 @@
<parameter name="mode" type="int">
</parameter>
</method>
<method name="getSharedPrefsFile"
return="java.io.File"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="name" type="java.lang.String">
</parameter>
</method>
<method name="getSystemService"
return="java.lang.Object"
abstract="false"
@ -29885,70 +29839,6 @@
</parameter>
</method>
</interface>
<interface name="IIntentReceiver"
abstract="true"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<implements name="android.os.IInterface">
</implements>
<method name="performReceive"
return="void"
abstract="true"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="intent" type="android.content.Intent">
</parameter>
<parameter name="resultCode" type="int">
</parameter>
<parameter name="data" type="java.lang.String">
</parameter>
<parameter name="extras" type="android.os.Bundle">
</parameter>
<parameter name="ordered" type="boolean">
</parameter>
<exception name="RemoteException" type="android.os.RemoteException">
</exception>
</method>
</interface>
<interface name="IIntentSender"
abstract="true"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<implements name="android.os.IInterface">
</implements>
<method name="send"
return="int"
abstract="true"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="code" type="int">
</parameter>
<parameter name="intent" type="android.content.Intent">
</parameter>
<parameter name="resolvedType" type="java.lang.String">
</parameter>
<parameter name="finishedReceiver" type="android.content.IIntentReceiver">
</parameter>
<exception name="RemoteException" type="android.os.RemoteException">
</exception>
</method>
</interface>
<class name="Intent"
extends="java.lang.Object"
abstract="false"
@ -34120,26 +34010,6 @@
>
<implements name="android.os.Parcelable">
</implements>
<constructor name="IntentSender"
type="android.content.IntentSender"
static="false"
final="false"
deprecated="not deprecated"
visibility="protected"
>
<parameter name="target" type="android.content.IIntentSender">
</parameter>
</constructor>
<constructor name="IntentSender"
type="android.content.IntentSender"
static="false"
final="false"
deprecated="not deprecated"
visibility="protected"
>
<parameter name="target" type="android.os.IBinder">
</parameter>
</constructor>
<method name="describeContents"
return="int"
abstract="false"
@ -47396,17 +47266,6 @@
<parameter name="entryName" type="java.lang.String">
</parameter>
</method>
<method name="getLearner"
return="android.gesture.Learner"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getOrientationStyle"
return="int"
abstract="false"
@ -48675,15 +48534,6 @@
>
</field>
</class>
<class name="Learner"
extends="java.lang.Object"
abstract="true"
static="false"
final="false"
deprecated="not deprecated"
visibility=""
>
</class>
<class name="OrientedBoundingBox"
extends="java.lang.Object"
abstract="false"
@ -118597,19 +118447,6 @@
<parameter name="mode" type="int">
</parameter>
</method>
<method name="getSharedPrefsFile"
return="java.io.File"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="name" type="java.lang.String">
</parameter>
</method>
<method name="getSystemService"
return="java.lang.Object"
abstract="false"

4
core/java/android/accessibilityservice/AccessibilityService.java
View File

@ -163,6 +163,10 @@ public abstract class AccessibilityService extends Service {
}
}
/**
* Implement to return the implementation of the internal accessibility
* service interface. Subclasses should not override.
*/
@Override
public final IBinder onBind(Intent intent) {
return new IEventListenerWrapper(this);

7
core/java/android/app/PendingIntent.java
View File

@ -273,11 +273,6 @@ public final class PendingIntent implements Parcelable {
return null;
}
private class IntentSenderWrapper extends IntentSender {
protected IntentSenderWrapper(IIntentSender target) {
super(target);
}
}
/**
* Retrieve a IntentSender object that wraps the existing sender of the PendingIntent
*
@ -285,7 +280,7 @@ public final class PendingIntent implements Parcelable {
*
*/
public IntentSender getIntentSender() {
return new IntentSenderWrapper(mTarget);
return new IntentSender(mTarget);
}
/**

3
core/java/android/content/Context.java
View File

@ -1283,7 +1283,8 @@ public abstract class Context {
* Use with {@link #getSystemService} to retrieve an
* {@blink android.backup.IBackupManager IBackupManager} for communicating
* with the backup mechanism.
*
* @hide
*
* @see #getSystemService
*/
public static final String BACKUP_SERVICE = "backup";

1
core/java/android/content/ContextWrapper.java
View File

@ -135,6 +135,7 @@ public class ContextWrapper extends Context {
return mBase.getPackageCodePath();
}
/** @hide */
@Override
public File getSharedPrefsFile(String name) {
return mBase.getSharedPrefsFile(name);

2
core/java/android/content/Intent.java
View File

@ -2390,7 +2390,7 @@ public class Intent implements Parcelable {
/**
* Create an intent from a URI. This URI may encode the action,
* category, and other intent fields, if it was returned by
* {@link #toUri}.. If the Intent was not generate by toUri(), its data
* {@link #toUri}. If the Intent was not generate by toUri(), its data
* will be the entire URI and its action will be ACTION_VIEW.
*
* <p>The URI given here must not be relative -- that is, it must include

9
core/java/android/content/IntentSender.java
View File

@ -52,6 +52,9 @@ import android.util.AndroidException;
* categories, and components, and same flags), it will receive a IntentSender
* representing the same token if that is still valid.
*
* <p>Instances of this class can not be made directly, but rather must be
* created from an existing {@link android.app.PendingIntent} with
* {@link android.app.PendingIntent#getIntentSender() PendingIntent.getIntentSender()}.
*/
public class IntentSender implements Parcelable {
private final IIntentSender mTarget;
@ -245,11 +248,13 @@ public class IntentSender implements Parcelable {
return b != null ? new IntentSender(b) : null;
}
protected IntentSender(IIntentSender target) {
/** @hide */
public IntentSender(IIntentSender target) {
mTarget = target;
}
protected IntentSender(IBinder target) {
/** @hide */
public IntentSender(IBinder target) {
mTarget = IIntentSender.Stub.asInterface(target);
}
}

5
core/java/android/content/pm/ApplicationInfo.java
View File

@ -131,8 +131,9 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
public static final int FLAG_UPDATED_SYSTEM_APP = 1<<7;
/**
* Value for {@link #flags}: this is set of the application has set
* its android:targetSdkVersion to something >= the current SDK version.
* Value for {@link #flags}: this is set of the application has specified
* {@link android.R.styleable#AndroidManifestApplication_testOnly
* android:testOnly} to be true.
*/
public static final int FLAG_TEST_ONLY = 1<<8;

1
core/java/android/gesture/GestureLibrary.java
View File

@ -35,6 +35,7 @@ public abstract class GestureLibrary {
return false;
}
/** @hide */
public Learner getLearner() {
return mStore.getLearner();
}

6
core/res/AndroidManifest.xml
View File

@ -833,7 +833,8 @@
android:protectionLevel="signature" />
<!-- Allows an application to call the activity manager shutdown() API
to put the higher-level system there into a shutdown state. -->
to put the higher-level system there into a shutdown state.
@hide -->
<permission android:name="android.permission.SHUTDOWN"
android:label="@string/permlab_shutdown"
android:description="@string/permdesc_shutdown"
@ -842,7 +843,8 @@
<!-- Allows an application to tell the activity manager to temporarily
stop application switches, putting it into a special mode that
prevents applications from immediately switching away from some
critical UI such as the home screen. -->
critical UI such as the home screen.
@hide -->
<permission android:name="android.permission.STOP_APP_SWITCHES"
android:label="@string/permlab_stopAppSwitches"
android:description="@string/permdesc_stopAppSwitches"

1
test-runner/android/test/mock/MockContext.java
View File

@ -110,6 +110,7 @@ public class MockContext extends Context {
throw new UnsupportedOperationException();
}
/** @hide */
@Override
public File getSharedPrefsFile(String name) {
throw new UnsupportedOperationException();