Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0250416a: am 78c951b2: Merge change 23704 into eclair

Browse Source 
Merge commit '0250416a8fc49693772205eaf521ece544b29757'

* commit '0250416a8fc49693772205eaf521ece544b29757':
  Fiddle system boot ordering.
This commit is contained in:
Dianne Hackborn
2009-09-02 18:00:00 -07:00
committed by Android Git Automerger
parent 6128a6a925 0250416a8f
commit cdc0341af8
6 changed files with 99 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/app/ActivityManagerNative.java
View File

@@ -941,13 +941,6 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
return true;
}
case SYSTEM_READY_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
systemReady();
reply.writeNoException();
return true;
}
case HANDLE_APPLICATION_ERROR_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
IBinder app = data.readStrongBinder();
@@ -2248,16 +2241,6 @@ class ActivityManagerProxy implements IActivityManager
data.recycle();
reply.recycle();
}
public void systemReady() throws RemoteException
{
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
mRemote.transact(SYSTEM_READY_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();
reply.recycle();
}
public boolean testIsSystemReady()
{
/* this base class version is never called */

3
core/java/android/app/IActivityManager.java
View File

@@ -233,7 +233,6 @@ public interface IActivityManager extends IInterface {
// Special low-level communication with activity manager.
public void startRunning(String pkg, String cls, String action,
String data) throws RemoteException;
public void systemReady() throws RemoteException;
// Returns 1 if the user wants to debug.
public int handleApplicationError(IBinder app,
int flags, /* 1 == can debug */
@@ -368,7 +367,7 @@ public interface IActivityManager extends IInterface {
int PUBLISH_CONTENT_PROVIDERS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+29;
int SET_PERSISTENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+30;
int FINISH_SUB_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+31;
int SYSTEM_READY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+32;
int START_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+33;
int STOP_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+34;
int BIND_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+35;

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

@@ -2035,6 +2035,7 @@ class SyncManager implements OnAccountsUpdatedListener {
private void sendSyncStateIntent() {
Intent syncStateIntent = new Intent(Intent.ACTION_SYNC_STATE_CHANGED);
syncStateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
syncStateIntent.putExtra("active", mNeedSyncActiveNotification);
syncStateIntent.putExtra("failing", mNeedSyncErrorNotification);
mContext.sendBroadcast(syncStateIntent);