drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,586 Commits 1 Branch 0 Tags
Commit Graph

97586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
beb0889671 docs: add backup service to gp docs 
Change-Id: Ic87f18f791b98fc3438bc79e6ae95de86f1cc8fc
 2012-12-04 14:16:45 -08:00
Raph Levien
49ed5da31d Merge "Reorder tone mark and nikhahit in DroidSansThai.ttf" into jb-mr1.1-dev 2012-12-04 14:11:56 -08:00
Daniel Sandler
526fa0e6d5 PRIORITY_MIN notifications should be truly ambient. 
If your notification is set to MIN priority, it will never
attempt to interrupt the user, either by an icon (already
implemented), or (new in this patch) by LED, vibration, or
sound.

Bug: 7648785
Change-Id: Ia0f8e010e62029d8d8ef1955dd20b7c79fb68398
 2012-12-04 17:01:12 -05:00
John Spurlock
33669f35e4 Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev 2012-12-04 13:45:50 -08:00
Jim Miller
eac4be7ef2 am 4fa27f31: am 80a90efc: Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev 
* commit '4fa27f314038620fd3c50170d2f8caebeb6005bb':
  Fix ring volume issue by addressing focus regression in keyguard.
 2012-12-04 12:33:49 -08:00
Jim Miller
4fa27f3140 am 80a90efc: Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev 
* commit '80a90efcbf32b30b886380c67585ddfb41c35437':
  Fix ring volume issue by addressing focus regression in keyguard.
 2012-12-04 12:32:19 -08:00
Jim Miller
80a90efcbf Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev 2012-12-04 12:29:16 -08:00
John Spurlock
006f567c21 Kill dreams that do not create a timely service connection. 
Implement a timeout between when the dream binds and
when the dream creates the service connection.  If
the connection is not created within a certain amount of
time, stop the dream.

This fixes the current bug where a dream that crashes in
onCreate (or the ctor) can put the dream controller in a
bad state until the screen is turned off.

The timeout is equal to the service restart delay in
activity manager (ActiveServices) to avoid restarting
(and recrashing).

Bug:7596707
Change-Id: I3e11efc6af0b79ec4cb0fbc94e4e109c7602ddac
 2012-12-04 15:10:04 -05:00
Victoria Lease
39ec1ec187 Merge "Fix Wrong parameter in HashMap.remove" 2012-12-04 11:56:04 -08:00
Matthew Xie
1ef98fb37e am 5cb09b7d: am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev 
* commit '5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a':
  Change getName and getAddress permission to BLUETOOTH
 2012-12-04 11:29:53 -08:00
Matthew Xie
5cb09b7dc5 am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev 
* commit '8b283df989f9b8b71797f9feaeb15cb012ab3190':
  Change getName and getAddress permission to BLUETOOTH
 2012-12-04 11:27:11 -08:00
Matthew Xie
8b283df989 am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev 
* commit 'b6b4f171ff38ccac833edb2a1ad7f725ed068d46':
  Change getName and getAddress permission to BLUETOOTH
 2012-12-04 11:25:14 -08:00
Matthew Xie
b6b4f171ff Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev 2012-12-04 11:21:55 -08:00
Daniel Sandler
3ff1139032 am 994901ee: am d9e46ac5: am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 
* commit '994901ee7f096751cc593e213ea60a1cbdd9504a':
  Revised language for notification ringtone picker.
 2012-12-04 11:09:25 -08:00
Daniel Sandler
994901ee7f am d9e46ac5: am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 
* commit 'd9e46ac5ffcd2a1b3abf70bde14af7d10ebf018b':
  Revised language for notification ringtone picker.
 2012-12-04 11:06:25 -08:00
Romain Guy
ee0ff18c36 Merge "Optimize onAttachedTo/onDetachedFromWindow" 2012-12-04 11:05:21 -08:00
Daniel Sandler
d9e46ac5ff am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 
* commit 'd8cb8fa463c9a527aff462f887dbca9fa9843fcf':
  Revised language for notification ringtone picker.
 2012-12-04 11:03:44 -08:00
Daniel Sandler
d8cb8fa463 Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 2012-12-04 11:01:04 -08:00
Laurent Tu
161f42619b Protect against NPE in FusionEngine.java. 
Bug: 7629406
Change-Id: Ic49a069eef47a62fb1e0c6f284a705a62c6ae232
 2012-12-04 10:58:43 -08:00
Matthew Xie
af5ddbfcf5 Change getName and getAddress permission to BLUETOOTH 
The permissions were set as BLUETOOTH_ADMIN by mistake. Correct them
bug 7665249

Change-Id: Ic1bdbeb25e8f55d886f9a8d38920cbb769dd38ca
 2012-12-04 10:47:43 -08:00
Craig Mautner
bebd1a092e am d3b9dd6c: am 40627de3: Merge "Remove unnecessary references in WindowManagerService" 
* commit 'd3b9dd6ca6325abe5cf2049c2894a86b256a3db1':
  Remove unnecessary references in WindowManagerService
 2012-12-04 10:39:59 -08:00
Craig Mautner
d3b9dd6ca6 am 40627de3: Merge "Remove unnecessary references in WindowManagerService" 
* commit '40627de3044c4a23c20c2229cab20aab21ff2b03':
  Remove unnecessary references in WindowManagerService
 2012-12-04 10:38:32 -08:00
Irfan Sheriff
56a715ef7a Merge "Fix NPE in StateMachine" 2012-12-04 10:23:09 -08:00
Irfan Sheriff
f98facaf80 Fix NPE in StateMachine 
Bug: 7661311
Change-Id: I8645692baf43aced1f4b364bbf13275646754b63
 2012-12-04 10:17:25 -08:00
You Kim
a6d0b6f851 Fix Wrong parameter in HashMap.remove 
Change-Id: Ibf93833697c865904f29821e5778853127e5fb00
Signed-off-by: You Kim <you.kim72@gmail.com>

Conflicts:

	services/java/com/android/server/LocationManagerService.java
 2012-12-04 09:57:23 -08:00
Craig Mautner
40627de304 Merge "Remove unnecessary references in WindowManagerService" 2012-12-04 09:45:03 -08:00
You Kim
cb6291c9b1 Remove unnecessary references in WindowManagerService 
Clean message routines in WindowManagerService.

Change-Id: I3e3106b6499c67d1fd7133c987c0452a73141a3f
Signed-off-by: You Kim <you.kim72@gmail.com>
 2012-12-05 00:10:03 +09:00
Daniel Sandler
efe89f28cb am 59912d40: am b8145002: am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev 
* commit '59912d40babedccb2346d94651f79491cbe5fd8e':
  Reduce false swipe-closed gestures in status bar panels.
 2012-12-04 06:06:32 -08:00
Daniel Sandler
aa9c5b6e9f Revised language for notification ringtone picker. 
Bug: 7659273
Change-Id: I5cb94a24b8ebff96ab5b567efc39a780300ee7ee
 2012-12-04 09:06:21 -05:00
Daniel Sandler
59912d40ba am b8145002: am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev 
* commit 'b814500269324bc24de13f974f9564ff176a578f':
  Reduce false swipe-closed gestures in status bar panels.
 2012-12-04 06:03:18 -08:00
Daniel Sandler
b814500269 am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev 
* commit '9f2532bf1215dffb4058d1b01834b3a0a7272fdc':
  Reduce false swipe-closed gestures in status bar panels.
 2012-12-04 06:00:02 -08:00
Daniel Sandler
9f2532bf12 Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev 2012-12-04 05:33:16 -08:00
satok
81f8b7c667 Fix an issue on installing 3rd-party IME by a non-primary user 
Bug: 7573552

Currently IMMS doesn't receive install/uninstall messages. Accordingly enabled IMEs' list is not refreshed properly.

Change-Id: I25e9798a65f528dd270cd6bb1f14b1d887194787
 2012-12-04 21:16:59 +09:00
Baligh Uddin
9347e00188 Merge "Import translations. DO NOT MERGE" 2012-12-03 21:21:39 -08:00
Baligh Uddin
31d949daee am ea71e29a: (-s ours) am a468a7e5: am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'ea71e29a4ba57641a5adc67ff12b46f214a32126':
  Import translations. DO NOT MERGE
 2012-12-03 21:21:06 -08:00
Baligh Uddin
5868368bd5 am 33383354: (-s ours) am 52190903: am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '333833541c7c69fcb6849fdd0b7fe9067f60000a':
  Import translations. DO NOT MERGE
 2012-12-03 21:19:29 -08:00
Baligh Uddin
ea71e29a4b am a468a7e5: am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'a468a7e533add133ffa4cf5aff89163c126307a7':
  Import translations. DO NOT MERGE
 2012-12-03 21:17:35 -08:00
Baligh Uddin
cabdbfcbda Merge "Import translations. DO NOT MERGE" 2012-12-03 21:15:55 -08:00
Baligh Uddin
a468a7e533 am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '8ef5660e3ccdd9de41b0d08992bfc2641d9c860b':
  Import translations. DO NOT MERGE
 2012-12-03 21:15:30 -08:00
Baligh Uddin
333833541c am 52190903: am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '521909035e0c406ba89c76b67f73cd88f7eb69dd':
  Import translations. DO NOT MERGE
 2012-12-03 21:13:58 -08:00
Baligh Uddin
8ef5660e3c Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-03 21:11:52 -08:00
Baligh Uddin
521909035e am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd8567b661c3197ed4b208141e1c0f0542ae2723a':
  Import translations. DO NOT MERGE
 2012-12-03 21:11:50 -08:00
Baligh Uddin
d8567b661c am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '47ae0b93c3a3b4fcb32cd46ad3b8313959344912':
  Import translations. DO NOT MERGE
 2012-12-03 21:09:55 -08:00
Baligh Uddin
4c5f46dfa8 am 2306bec5: (-s ours) am 4ca5fbaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '2306bec5851265146cecd4d5fdf02c930697a453':
  Import translations. DO NOT MERGE
 2012-12-03 21:08:08 -08:00
Baligh Uddin
47ae0b93c3 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-12-03 21:04:42 -08:00
Baligh Uddin
2306bec585 am 4ca5fbaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4ca5fbaa91dc002647b2fd5f63b8a162cefc3553':
  Import translations. DO NOT MERGE
 2012-12-03 21:04:02 -08:00
Baligh Uddin
4ca5fbaa91 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-03 21:00:51 -08:00
Romain Guy
fbb93fa2f3 Optimize onAttachedTo/onDetachedFromWindow 
Apps detaching/attaching large subtrees would waste a few milliseconds
dealing with dirty display lists. This change removes the need to do
ArrayList.remove() on every detachedFromWindow().

Change-Id: Icee72516c40d48ff0fd9d6f3128589f99bf61428
 2012-12-03 18:51:57 -08:00
Jim Miller
147f9568af Fix ring volume issue by addressing focus regression in keyguard. 
This fixes a regression where ring volume can be changed in keyguard.
Because KeyguardHostView is now being re-created in onScreenTurnedOff(),
it loses focus and the volume keys get handled by the fallback handler.

The fix is to ensure at least one child under KeyguardHostView has focus
whenever we re-create it.

Fixes bug 7546960

Change-Id: I34b7db402401a824f463d35d7546c05dc2979243
 2012-12-03 18:48:52 -08:00
Svetoslav Ganov
1616269a40 Merge "Adding API for refreshing the state of an AccessibilityNodeInfo." 2012-12-03 17:25:06 -08:00