Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,650 Commits 3 Branches 0 Tags
aefb1ea5b08a612da42e852366acfedcb802a6fd
Commit Graph

709 Commits

Author SHA1 Message Date
Mike Lockwood
cace13d72a Merge "StorageManager: Add getVolumeList() and getVolumeState() methods" 2011-04-04 17:39:21 -07:00
Jason parks
c5a229665d am 5ee250aa: am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '5ee250aa744720c90b264966f9721cfb9d256e96':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:46:34 -07:00
Jason parks
5ee250aa74 am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:43:34 -07:00
Mike Lockwood
8fa5f804e2 StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: Icf3301827dd27e8430bd44eaafde517a31ef035a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-04 18:54:03 -04:00
Jason parks
1d73362597 am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 12:20:33 -07:00
Jeff Hamilton
f9fb0abbd6 am 0c691f0e: am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit '0c691f0eb3bc844e778f9a61e777076658879dfd':
  Update the value for the NFC shared UID.
 2011-03-30 16:31:27 -07:00
Jason parks
cca2f2f987 Merge "Send out a broadcast that the system is being factory reset." into gingerbread 2011-03-30 08:17:53 -07:00
Jeff Hamilton
0c691f0eb3 am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
  Update the value for the NFC shared UID.
 2011-03-29 16:28:49 -07:00
Jeff Hamilton
ad91eee277 am 9c1ef098: Update the value for the NFC shared UID. 
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
 2011-03-24 20:21:41 -07:00
Jeff Hamilton
9c1ef09883 Update the value for the NFC shared UID. 
Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
 2011-03-24 21:39:58 -05:00
Jesse Wilson
112d339673 Fix MemoryFile's output stream to advance. 
Previously it was not useful.

Change-Id: I0bcc06b65bab33a38a0b0148c020509076a51b1c
http://code.google.com/p/android/issues/detail?id=11415
 2011-03-24 18:18:19 -07:00
Dianne Hackborn
315f19be8e am daa71254: am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit 'daa71254f3e3261ecc0e143955c89ced70bbf008':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:07:17 -07:00
Dianne Hackborn
daa71254f3 am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit 'efb56934efdc0aae38ce7264f2576326293846b6':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:05:08 -07:00
Joe Onorato
d630f105e8 AsyncTask now uses the poll executor for apps up through HC MR1 and the serialized one after that. 
Change-Id: I47d135ace5f8e78e4fa44ac9d1bf7abeeb9d3ba0
 2011-03-17 18:42:26 -07:00
Dianne Hackborn
edf1fc6ce6 Whoops, forgot the HONEYCOMB_MR1 constant. :( 
It shouldn't be a problem to put this in -- it is a static final
so it doesn't actually need to be in the on-device system image.

This is important for the SDK.

Change-Id: Iaa086247d0d65fe708c40fbab506aa60cd3e1396
 2011-03-17 18:34:48 -07:00
Kenny Root
63fce8c56d Merge "Update WakeLock-related docs to mention permissions" 2011-03-16 10:05:23 -07:00
Kenny Root
d710fb500c Update WakeLock-related docs to mention permissions 
android.permission.WAKE_LOCK permission is required to use WakeLock or
WifiLock, but nowhere is it mentioned that you must declare that
permission to use it.

Change-Id: Ib5f5294d37e39169fe5678743f380d95c4e5a842
 2011-03-16 09:38:11 -07:00
Jason parks
4ca74dc4c2 Send out a broadcast that the system is being 
factory reset.

Change-Id: I339b7ce58cb3f48316103be49b582d4f7e9b63bf
 2011-03-16 09:29:47 -05:00
Dianne Hackborn
9b7c1274dd am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread 
* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
  Improve error reporting for issue #3183612
 2011-03-15 15:44:18 -07:00
Dianne Hackborn
e2e8da7c73 am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread 
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
  Improve error reporting for issue #3183612
 2011-03-15 14:49:45 -07:00
Dianne Hackborn
1ab43775d8 Improve error reporting for issue #3183612 
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.

Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
 2011-03-15 14:38:02 -07:00
Andy Stadler
50c294f21b Clarify rules about encryption of emulated storage. 
Bug: 3351426
Change-Id: I3a8fcd369862f3eab1781699108e29fe7ab474a0
 2011-03-07 19:13:42 -08:00
Dianne Hackborn
e3a7f628c6 Fix Fragment.onInflate() to actually work correctly. 
Like, um, it needs to be given the Activity since this is called before
the activity is attached.

And it was called after the entire fragment and its *view* was created
when being restored from saved state.

And the documentation was whacked.

Also fix the IME selector to dismiss when you tap outside of it.

Change-Id: Icbcafe7558965a570bdef9cda3441b1f0f7a317c
 2011-03-03 22:17:16 -08:00
Simon Wilson
d984ba1320 am df58a1bb: am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread 
* commit 'df58a1bbf8d7f6608848eae4d5d48dcff137dc8c':
  Attempt to reduce problems from issue #3183612
 2011-03-02 22:11:19 -08:00
Simon Wilson
df58a1bbf8 am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread 
* commit '3d79f1ce84ee60dbb26468b9e5f75f4ccb5ed8aa':
  Attempt to reduce problems from issue #3183612
 2011-03-02 18:13:49 -08:00
Simon Wilson
3d79f1ce84 am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread 
* commit 'edc68a001cd94d2011029004cb27231432a18575':
  Attempt to reduce problems from issue #3183612
 2011-03-02 18:10:33 -08:00
Simon Wilson
edc68a001c Merge "Attempt to reduce problems from issue #3183612" into gingerbread 2011-03-02 18:03:52 -08:00
Christopher Tate
bd8b6f25bb Fix binder proxy death notice tracking 
There was an issue with stale recipient tracking when BinderProxy weak
references had been purged and a new proxy object allocated for a
still-live underlying IBinder.  The death recipient bookkeeping has
now been reworked so that it's fundmentally tied to the BinderProxy
instances, not maintained as global state, to prevent this sort of
confusion entirely.

Bug 3499939

Change-Id: I75c5216b6d53b90868ac969e32c9725201e51be3
 2011-03-01 18:25:52 -08:00
Dianne Hackborn
c9119f5034 Add ParcelFileDescriptor APIs to get raw fd. 
Change-Id: I66ba72ffffd27237e60c9411453eef950ae62705
 2011-02-28 18:03:26 -08:00
Elliott Hughes
a28b83ee04 Fix Parcel.writeNative to not ignore 'offset'. 
Also switch to using libcore's array bounds checking. (This variant had no
detail message and was missing the length check.)

Bug: http://code.google.com/p/android/issues/detail?id=15075
Change-Id: Icfc045bd59403b59f02d95c8514abf881d3996e5
 2011-02-28 14:55:29 -08:00
Jason Chen
22577b8d3a am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:03:34 -08:00
Dianne Hackborn
9248e95a2f DO NOT MERGE Cherry-pick of Ie4026a7c back to GB 
Original change description follows:
-----------------------------------

Implement issue #3326435: Battery stats improvements

Keep track of discharge while screen is on vs. off.

Checkin looks like:

5,0,u,dc,1,1,1,0

The last four numbers are, from left:

- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.

Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
 2011-02-23 17:21:09 -08:00
Wink Saville
5284090631 Changes for ril.h version 6. 
Change-Id: Iacd9d362c4836546ac277cf3571227d426a721aa
 2011-02-18 12:40:47 -08:00
Dianne Hackborn
e5dea7537c Attempt to reduce problems from issue #3183612 
java.lang.SecurityException: Neither user 1209 nor current...
...process has android.permission.WAKE_LOCK.

It looks like, somehow, the calling uid/pid of the SyncHandler
thread is getting corrupted.  This change has Looper check for
these values changing from their original defaults and, if there
is a problem, resetting them and logging a WTF.  Hopefully this
will avoid crashing the process, while also giving us more
helpful error reports about what is going on.

Change-Id: Iff06d575951fb8c06e2a3c31141f2907a715eb81
 2011-02-09 14:19:23 -08:00
Jean-Baptiste Queru
d2ed82fb94 am 66700397: Merge 3100207b from gingerbread-plus-aosp 
* commit '66700397496fc6f6d26f9f0b56ead8ef610b9654':
  Tweak to make merges easier
 2011-01-29 14:54:43 -08:00
Jean-Baptiste Queru
6670039749 Merge 3100207b from gingerbread-plus-aosp 
Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588
 2011-01-29 14:51:17 -08:00
Jean-Baptiste Queru
3100207be5 am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:43:33 -08:00
Jean-Baptiste Queru
1358b6a4fb Tweak to make merges easier 
Bug: 3364311

Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
 2011-01-29 12:54:09 -08:00
Jason parks
450536b6a6 am d4796c82: am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb 
* commit 'd4796c823b92866d5895acf610e5571e9b5724d9':
  Update the encryption password when the device password is changed.
 2011-01-29 12:06:39 -08:00
Jason parks
d4796c823b am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb 
* commit 'a2e765ef1ad2cb907a4ae0a93bb15e4764ebb59a':
  Update the encryption password when the device password is changed.
 2011-01-29 12:04:11 -08:00
Jason parks
f7b3cd4efd Update the encryption password when the device password is changed. 
* Added changeEncryptionPassword() to the MountService.
* Update LockPatternUtils to call changeEncryptionPassword()
  when the password is changed.

Note we only require the new password to change the
encryption password.

Bug: 3382129
Change-Id: I26a7e919e325e75e22fa4290da0a8b1b57b55a80
 2011-01-28 13:52:37 -06:00
Kenny Root
bd549fe0bb am 7dbf0696: resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp 
* commit '7dbf0696ef37097f2bcec058f876f7f4ba63d357':
  Make ObbActionListener a on-way call
 2011-01-26 11:43:31 -08:00
Kenny Root
7dbf0696ef resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp 
Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c
 2011-01-26 11:10:36 -08:00
Kenny Root
2c1d0967ba Merge "Make ObbActionListener a on-way call" into honeycomb 2011-01-26 11:01:14 -08:00
Kenny Root
29a208e12c am ff271a22: am 2ec4af59: am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit 'ff271a2288f375fc7a5854ac0d1f7c969d91996d':
  Make OBB results a one-way call
 2011-01-26 10:13:54 -08:00
Kenny Root
ff271a2288 am 2ec4af59: am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit '2ec4af59209ab3a7088a001bbbcb10ef0b846564':
  Make OBB results a one-way call
 2011-01-26 10:11:21 -08:00
Kenny Root
2ec4af5920 am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
 2011-01-26 09:25:43 -08:00
Dianne Hackborn
0793749661 am b8fc8c26: am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 
* commit 'b8fc8c26cba829225469a65bf8e35b06de54588e':
  Change AsyncTask.execute() back to using a thread pool...
 2011-01-25 22:09:50 -08:00
Dianne Hackborn
b8fc8c26cb am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 
* commit '4fbca2b6138c52405fd7fb241bbf3c21fddd04bb':
  Change AsyncTask.execute() back to using a thread pool...
 2011-01-25 22:08:16 -08:00
Dianne Hackborn
96438cd658 Change AsyncTask.execute() back to using a thread pool... 
...for now.

Change-Id: I1fe64f3e3a575f85add11dfe4d405f0c3a4a49de
 2011-01-25 21:42:37 -08:00