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

120294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
a48de70003 Merge "clarification to the uses-configuration tag to discourage its use." into klp-docs 2013-11-14 19:17:01 +00:00
Jeff Sharkey
b32bd76afd am be20c897: am 601fbc7a: am 24fe066e: Merge "Fix am argument ordering documentation." into klp-dev 
* commit 'be20c89731b5172ccc353c0ae570adcafbf8ca94':
  Fix am argument ordering documentation.
 2013-11-14 11:12:20 -08:00
Jeff Sharkey
be20c89731 am 601fbc7a: am 24fe066e: Merge "Fix am argument ordering documentation." into klp-dev 
* commit '601fbc7a82f325971905b6083e1c54776aa87a6d':
  Fix am argument ordering documentation.
 2013-11-14 11:08:19 -08:00
Jeff Sharkey
601fbc7a82 am 24fe066e: Merge "Fix am argument ordering documentation." into klp-dev 
* commit '24fe066ee2ea6d6ea9e30e6f323dad6960c24177':
  Fix am argument ordering documentation.
 2013-11-14 11:03:57 -08:00
Jeff Sharkey
24fe066ee2 Merge "Fix am argument ordering documentation." into klp-dev 2013-11-14 19:01:07 +00:00
Jeff Sharkey
7625c84045 Fix am argument ordering documentation. 
Bug: 11690520
Change-Id: I84b10a6eb6e6404212ab9737e7cee1f1ad4d5309
 2013-11-14 10:57:55 -08:00
Joe Fernandez
b4eb1c0a17 am 8c550556: am 71c0d757: am c4af2806: Merge "docs: Support Library setup docs fix" into klp-docs 
* commit '8c5505565e4e0bb75039a148a58cf7fa4398f8ff':
  docs: Support Library setup docs fix
 2013-11-14 09:37:40 -08:00
Joe Fernandez
8c5505565e am 71c0d757: am c4af2806: Merge "docs: Support Library setup docs fix" into klp-docs 
* commit '71c0d75770fd2c8d0b94e730604d14965b905b62':
  docs: Support Library setup docs fix
 2013-11-14 09:34:01 -08:00
Matthew Williams
bef1f9a370 am 72402f9d: am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev 
* commit '72402f9de7b108d77316e3c93399b07a2f98c42a':
  SyncManager now returns copy on getCurrentSyncs()
 2013-11-14 09:32:02 -08:00
Joe Fernandez
71c0d75770 am c4af2806: Merge "docs: Support Library setup docs fix" into klp-docs 
* commit 'c4af28067889c057615137ef02de32abc4a1e8f9':
  docs: Support Library setup docs fix
 2013-11-14 17:29:29 +00:00
Matthew Williams
72402f9de7 am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev 
* commit '09d8e3cf4e411b016ee65d8328dd7a443c9de0ff':
  SyncManager now returns copy on getCurrentSyncs()
 2013-11-14 09:27:26 -08:00
Joe Fernandez
c4af280678 Merge "docs: Support Library setup docs fix" into klp-docs 2013-11-14 17:25:45 +00:00
Matthew Williams
09d8e3cf4e am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev 
* commit 'c68bb18244aa12d19bea9f9d59f2fe0d81478904':
  SyncManager now returns copy on getCurrentSyncs()
 2013-11-14 09:23:32 -08:00
Matthew Williams
c68bb18244 Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev 2013-11-14 17:18:58 +00:00
Scott Main
6bbd6c6a3c am d1b0af82: am 3f6d9630: am 34aab81a: Merge "add information about required meta-data for gcore bug: 11553131" into klp-docs 
* commit 'd1b0af82855528c531a35d28d3c65d7a94f2228c':
  add information about required meta-data for gcore bug: 11553131
 2013-11-13 23:42:10 -08:00
Scott Main
d1b0af8285 am 3f6d9630: am 34aab81a: Merge "add information about required meta-data for gcore bug: 11553131" into klp-docs 
* commit '3f6d9630e8a8d7b5b3040d510885e10fca6e4efc':
  add information about required meta-data for gcore bug: 11553131
 2013-11-13 23:38:02 -08:00
Scott Main
3f6d9630e8 am 34aab81a: Merge "add information about required meta-data for gcore bug: 11553131" into klp-docs 
* commit '34aab81a255545a029dc436bd63dd275a6ef3aa5':
  add information about required meta-data for gcore bug: 11553131
 2013-11-14 07:32:22 +00:00
Scott Main
34aab81a25 Merge "add information about required meta-data for gcore bug: 11553131" into klp-docs 2013-11-14 07:28:58 +00:00
Satoshi Kataoka
4335047ea4 am b97e102c: am 1b570b57: am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype 
* commit 'b97e102c4b9041ea8c5bb753743f2e1d7d3cf06a':
  Fix compatibility issue on InputMethodSubtype
 2013-11-13 22:32:43 -08:00
Satoshi Kataoka
b97e102c4b am 1b570b57: am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype 
* commit '1b570b571a63311f7f7d5b7cc5e17b3103fa8af9':
  Fix compatibility issue on InputMethodSubtype
 2013-11-13 22:28:47 -08:00
Satoshi Kataoka
1b570b571a am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype 
* commit '5fd5aa3d066fc12c92b5b6541d85ac243556223f':
  Fix compatibility issue on InputMethodSubtype
 2013-11-13 22:25:01 -08:00
Jean Chalard
20e4995a03 am 86a35ab4: (-s ours) am 94be0049: am 4863e686: Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs 
* commit '86a35ab4e757e266f613a2e431e16977514600a7':
  [DO NOT MERGE] Improve documentation for InputType and EditorInfo.
 2013-11-13 22:18:29 -08:00
Adam Powell
c3c0c18d5a am 73a4aeb9: am 75ae8983: am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background 
* commit '73a4aeb9ffa15a2c08edf3ba69157c08821930ee':
  Reset padding flags when set programmatically or implicitly from background
 2013-11-13 22:18:10 -08:00
Jean Chalard
86a35ab4e7 am 94be0049: am 4863e686: Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs 
* commit '94be004960d5cabacb5da4a98e08b02d174b0ba7':
  [DO NOT MERGE] Improve documentation for InputType and EditorInfo.
 2013-11-13 22:11:48 -08:00
Satoshi Kataoka
5fd5aa3d06 Fix compatibility issue on InputMethodSubtype 
Bug: 11032428
Change-Id: If722bbbfb69d00e1830007582d46a33319203eea
 2013-11-14 15:08:39 +09:00
Jean Chalard
94be004960 am 4863e686: Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs 
* commit '4863e686d8db10537a1131732672da5203245788':
  [DO NOT MERGE] Improve documentation for InputType and EditorInfo.
 2013-11-14 06:08:28 +00:00
Jean Chalard
4863e686d8 Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs 2013-11-14 06:04:15 +00:00
Scott Main
f0373abef9 add information about required meta-data for gcore 
bug: 11553131

Change-Id: Ie3890c7894a017fc28e4a094a0e1ec3ac9f8c043
 2013-11-13 21:45:35 -08:00
Jean-Michel Trivi
320ad9fa1d Fix RemoteController update in RemoteControlClient registration 
A regression was introduced when trying to limit the number of
 internal synchronization generation IDs that caused RCC
 information to be shown only for applications that requested
 audio focus after media button receiver and RCC registration,
 (such as Play Music), not for applications that requested focus
 first (such as Play Movies).
The correct behavior is to always check and update the
 RemoteControllers (seen by MediaFocusControl as RCD interfaces)
 whenever a RemoteControlClient is registered (even if it's a
 re-registration) when it is associated when an entry at the top
 of the remote control stack.

Bug 11657655

Change-Id: I30716e2028f7f718a31e13401b191178735229ff
 2013-11-13 20:06:41 -08:00
Adam Powell
73a4aeb9ff am 75ae8983: am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background 
* commit '75ae89837615fa9cebd6cbb051213c025c48bcf6':
  Reset padding flags when set programmatically or implicitly from background
 2013-11-13 19:45:21 -08:00
Adam Powell
75ae898376 am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background 
* commit '48d2bcf2ce2305356c5a4f0dfbb928dc5a4c8331':
  Reset padding flags when set programmatically or implicitly from background
 2013-11-13 19:41:07 -08:00
Adam Powell
48d2bcf2ce Reset padding flags when set programmatically or implicitly from background 
Bug 11673480

Change-Id: I4f33c7ae46e937302e625bf1f3260adb25843645
 2013-11-13 19:21:50 -08:00
Jim Miller
a516481fef am 71fb32e0: am 5305fe3f: am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev 
* commit '71fb32e0801ee9b4d0ed1c9063afbdf17635b30e':
  Don't set up external displays from binder thread
 2013-11-13 18:48:43 -08:00
Svetoslav
9d1d899c1b am 5880b363: am fe666e84: am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 
* commit '5880b363a6b7fd417b6a8f0802f144fb38c82117':
  Avoid NPE and add a warning log if a printing app misbehaves.
 2013-11-13 18:48:40 -08:00
Jim Miller
35f5bdd160 am fdf7c36d: am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev 
* commit 'fdf7c36daaeec8c6ad7872f81e1f9c3faf1a0e91':
  Report keyguard as initially showing and secure until we know
 2013-11-13 18:48:36 -08:00
Robert Greenwalt
a022c19331 am d4257e8f: resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp 
* commit 'd4257e8f469eacc1ba8142b0b1bc4ca0327a7a0e':
  Fix for the invalid Global Proxy Setting
 2013-11-13 18:48:31 -08:00
Glenn Kasten
62ca3a891d am c5f317e4: am 1b21665b: am c32d89f6: Merge "Replace keyboard sounds with latest (softer) design" into klp-dev 
* commit 'c5f317e48e0406a0303eb1303cee4c5da2c6272d':
  Replace keyboard sounds with latest (softer) design
 2013-11-13 18:48:20 -08:00
Vinit Deshapnde
5d5f5a3791 am 9dbaaab8: am daf21d76: am 75c12de0: Merge "Increase Reject threshold for disabling networks" into klp-dev 
* commit '9dbaaab85eb4557b40086e6b37882af7b03725ba':
  Increase Reject threshold for disabling networks
 2013-11-13 18:48:13 -08:00
Lajos Molnar
bd686a1e1d am 752926c7: am 1197bc37: am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '752926c752b9516c05a36f3eed6ab6b77d32b2c6':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 18:48:09 -08:00
Robert Greenwalt
8bf47a36b6 am 7fdfe28c: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '7fdfe28c75e103b8a66b559dcb813576fbbf2eb5':
  Fix for the invalid Global Proxy Setting
 2013-11-13 18:47:57 -08:00
Craig Mautner
a3da4623b1 am 1fbb5da2: am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev 
* commit '1fbb5da29a4ebef1d758dffad9c2704a5932d223':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
  Add null pointer check.
  Import translations. DO NOT MERGE
  Small DocumentsProvider doc improvements.
  Keyguard isn't visible if it hasn't been drawn.
  Enable fast camera transition when launched from navbar
  Reduce camera launch time by about 250ms.
  camera2: Remove prior repeating request when setting.
 2013-11-13 18:47:54 -08:00
Svetoslav
1b967a1b23 resolved conflicts for merge of 9358d98d to master 
Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3
 2013-11-13 18:43:32 -08:00
Matthew Williams
a7456e46f4 SyncManager now returns copy on getCurrentSyncs() 
Bug:11559103
Added a new getCurrentSyncsCopy() that is public. The other version
is needed for internal SSE calls.

Change-Id: I0287f039a6f75abf04b65b85cb30f78353aeef4f
 2013-11-13 18:17:54 -08:00
Scott Main
c71a22255d clarification to the uses-configuration tag to discourage its use. 
Change-Id: I5ee9ca93e8debaf2dfb8f1018b77af4486f1e516
 2013-11-13 18:03:06 -08:00
Jim Miller
71fb32e080 am 5305fe3f: am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev 
* commit '5305fe3f0971274d90d875cfbeffdb18e3b03f09':
  Don't set up external displays from binder thread
 2013-11-13 17:54:11 -08:00
Svetoslav
5880b363a6 am fe666e84: am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 
* commit 'fe666e848a1672a414bad93c105fa876f6c9f4de':
  Avoid NPE and add a warning log if a printing app misbehaves.
 2013-11-13 17:54:08 -08:00
Jim Miller
fdf7c36daa am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev 
* commit '378c804d652f32547d3fe460842e5720b57bd9f1':
  Report keyguard as initially showing and secure until we know
 2013-11-13 17:54:04 -08:00
Robert Greenwalt
d4257e8f46 resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp 
Change-Id: I220a034cf3293a4a29d8683f20812adac112bddd
 2013-11-13 17:50:35 -08:00
Jim Miller
5305fe3f09 am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev 
* commit '39af5a78c073d01539625a9fbbb8511747e2f048':
  Don't set up external displays from binder thread
 2013-11-13 17:50:26 -08:00
Svetoslav
fe666e848a am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 
* commit '4e04115052a66d5a7836c5e7a9bfc1a5d6f3784b':
  Avoid NPE and add a warning log if a printing app misbehaves.
 2013-11-13 17:50:22 -08:00