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

46516 Commits

Author SHA1 Message Date
Dianne Hackborn
6f5d85377b am 47b260d0: am 572b759a: Merge "Use index in SparseArray access properly" 
* commit '47b260d071859a8c20bb0af2bcc095e253f7046c':
  Use index in SparseArray access properly
 2013-11-14 16:37:55 -08:00
Dianne Hackborn
47b260d071 am 572b759a: Merge "Use index in SparseArray access properly" 
* commit '572b759a41fd490fd21b5831dd8b8434b7fd5df8':
  Use index in SparseArray access properly
 2013-11-14 16:35:42 -08:00
Dianne Hackborn
572b759a41 Merge "Use index in SparseArray access properly" 2013-11-15 00:33:20 +00:00
Jeff Brown
cef34fce3c Update cast screen strings. 
Bug: 11257292
Change-Id: Ia66152985bafcdd8ec88a3145623536a2b439b78
 2013-11-14 16:03:36 -08:00
Christopher Tate
63e1883d96 am a5acd62b: am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev 
* commit 'a5acd62bdefe5b616c0ea080434e9dd221169527':
  Ensure recipient can be launched before attempting broadcast delivery
 2013-11-14 15:49:15 -08:00
Christopher Tate
a5acd62bde am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev 
* commit '6e5cf573f2f2e17825af2973daeba893c6aa5855':
  Ensure recipient can be launched before attempting broadcast delivery
 2013-11-14 15:44:40 -08:00
Christopher Tate
6e5cf573f2 am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev 
* commit '99437f252b728f4946940f232c4b73b9dda76cfb':
  Ensure recipient can be launched before attempting broadcast delivery
 2013-11-14 15:04:31 -08:00
Christopher Tate
99437f252b Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev 2013-11-14 22:59:20 +00:00
Martijn Coenen
f180f30b0d Add "urn:nfc" shortener. 
As defined in the NFC Forum specification
"URI Record Type Definition". For some reason
0x23 wasn't added in the past, but it's present
in the specification.

Change-Id: If4ec2216fd53a31943f6de62aa1c69166f597616
 2013-11-14 13:40:07 -08:00
Christopher Tate
ba629da331 Ensure recipient can be launched before attempting broadcast delivery 
User removal or eviction inherently races with broadcast delivery.  This
patch introduces a latest-possible recheck of the availbility of the
target application before attempting to send it a broadcast.

Once the process has actually been spun up the system is essentially
committed to presenting it as a running application, and there is no
later check of the availability of the app: the failure mode for
continuing to attempt delivery is a crash *in the app process*,
and is user-visible.

We now check the app+userid existence of the intended recipient
just prior to committing to launch its process for receipt, and
if it is no longer available we simply skip that receiver and
continue normally.

Bug 11652784
Bug 11272019
Bug 8263020

Change-Id: Ib19ba2af493250890db7371c1a9f853772db1af0
 2013-11-14 12:37:31 -08:00
Zhijun He
e5d2af6be2 Merge "Camera2: Fix metadata unit test failures" 2013-11-14 20:13:22 +00:00
Zhijun He
2f1680be3d Camera2: Fix metadata unit test failures 
The get/set override for special cases broke the metadata unit test, add proper
handling to fix the test failures.

Also make the key equals check both names and types.

Bug: 11259962
Change-Id: I00ff53115e7043212035cc4306e0481f9d113747
 2013-11-14 12:11:32 -08:00
Matthew Williams
ee7081d1ed Resolve build breakage for merge of fix to b/11559103 
Change-Id: Ib42eb48a234f53d34d23f5c661331b2f37be4209
 2013-11-14 11:52:58 -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
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
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
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
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
Satoshi Kataoka
5fd5aa3d06 Fix compatibility issue on InputMethodSubtype 
Bug: 11032428
Change-Id: If722bbbfb69d00e1830007582d46a33319203eea
 2013-11-14 15:08:39 +09: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
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
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
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
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
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
Svetoslav
4e04115052 Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 2013-11-14 01:46:47 +00:00
Svetoslav
afd1967503 Avoid NPE and add a warning log if a printing app misbehaves. 
An app can print only from an activity. If the activity is finished
before printing completes we destroy the PrintDocumentAdapter. The
app may however invoke some of the print callbacks after destruction
resulting in a NPE. This change checks if the adapter is destroyed
and if so does not crash while printing a meaningful log error with
the mistake of the app developer.

bug:11675274

Change-Id: I66539cfbd7583f52cb863a84ef8e40856f92ceed
 2013-11-13 17:31:15 -08:00
Lajos Molnar
752926c752 am 1197bc37: am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '1197bc37e58fe7cd5ab32278367e53f19f01f784':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 16:44:55 -08:00
Lajos Molnar
1197bc37e5 am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '7e11b16b9f8896170d492240a5fd50c8bd04105d':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 16:40:26 -08:00
Robert Greenwalt
7fdfe28c75 am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '4c514f2a688bdae319c919987092ccfee690f390':
  Fix for the invalid Global Proxy Setting
 2013-11-13 16:29:12 -08:00
Robert Greenwalt
ec9e8933ef am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting" 
* commit '3b9244b4b4d5008daa9763a169a751975c75cc54':
  Fix for the invalid Global Proxy Setting
 2013-11-13 16:27:56 -08:00
Lajos Molnar
7e11b16b9f VideoView: expand documentation on state save/restore limitations 
Change-Id: I46f231d314fc4ae8d9d11389aa62a3e2698122ed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412889
 2013-11-13 16:27:30 -08:00
Robert Greenwalt
4c514f2a68 am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '594eeb082e548617ff5092496888c43457593c2b':
  Fix for the invalid Global Proxy Setting
 2013-11-13 16:26:45 -08:00
Raj Mamadgi
92d02491ad Fix for the invalid Global Proxy Setting 
Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568

Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
 2013-11-14 00:08:21 +00:00
Jeff Sharkey
d596104a32 am 529ba106: am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev 
* commit '529ba10693bbb2d756b2ba6af706accdba64692a':
  Small DocumentsProvider doc improvements.
 2013-11-13 14:39:25 -08:00
Jeff Sharkey
529ba10693 am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev 
* commit '711d390be96531c5dfadb9a17e373f1e92ef16a1':
  Small DocumentsProvider doc improvements.
 2013-11-13 14:34:49 -08:00
Jeff Sharkey
711d390be9 Merge "Small DocumentsProvider doc improvements." into klp-dev 2013-11-13 22:31:01 +00:00
Svetoslav
b1c305f9fc am e84f23b5: am 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit 'e84f23b5fd72c03ca4c8cbef3bc1fde4eec29f36':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:42:57 -08:00
Svetoslav
e84f23b5fd am 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit '60020252db88825b0c0951de7fef6f07d68786a9':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:38:21 -08:00
Svetoslav
60020252db am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit '14f300803b7d16a3c9632cb626529e873e4813f1':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:34:00 -08:00
Jeff Sharkey
3b945405cf Small DocumentsProvider doc improvements. 
Bug: 11670294
Change-Id: I5fb91c7665fc2a4531059ef9f2de0972ebabe1ea
 2013-11-13 13:31:17 -08:00
Svetoslav
14f300803b Merge "Update the PrintDocumentAdapter docs." into klp-dev 2013-11-13 21:30:58 +00:00
Baligh Uddin
2d11b48b5f Import translations. DO NOT MERGE 
Change-Id: I708597a97a9b4bf82eab684dcf4e743a9cdf1eb5
Auto-generated-cl: translation import
 2013-11-13 13:07:54 -08:00