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

120227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
8ef91cdcbe am 587693f3: am 92caa0c7: am c5cdd541: remove device list for nexus devices, clarify its needed for adb 
* commit '587693f31e64dd4cbf9fd77fa44374cd22b1ff3e':
  remove device list for nexus devices, clarify its needed for adb
 2013-11-14 15:48:59 -08:00
Jim Miller
dab5ba58fe am 434b4acb: am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev 
* commit '434b4acb997484e7a540bf44bebd6b17c63fe270':
  Don't show keyguard until the device has been provisioned.
 2013-11-14 15:44:51 -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
Dianne Hackborn
8e9b5fc932 am 59bf3be7: am 2e3ede74: Merge "Maybe fix issue #11634365: Leaking restarting services" into klp-dev 
* commit '59bf3be7d1cd7311cf60ead6872f33433a097bd1':
  Maybe fix issue #11634365: Leaking restarting services
 2013-11-14 15:44:36 -08:00
Katie McCormick
0dcddb447c am 9db6e7c6: am fb828c8c: Merge "Doc Update: add immersive mode to sysui class." into klp-docs 
* commit '9db6e7c6d0e451ec1799d9ed81f911c5f77977e2':
  Doc Update: add immersive mode to sysui class.
 2013-11-14 15:44:32 -08:00
Jean-Michel Trivi
7c9adaf6b9 am dc6da58a: am 2a96fc1f: Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev 
* commit 'dc6da58aa79f97d6bbd0fa8fd4e694f1e76973f0':
  Fix RemoteController update in RemoteControlClient registration
 2013-11-14 15:44:16 -08:00
Scott Main
587693f31e am 92caa0c7: am c5cdd541: remove device list for nexus devices, clarify its needed for adb 
* commit '92caa0c7aa801634c9b47297818938c7aed82a38':
  remove device list for nexus devices, clarify its needed for adb
 2013-11-14 15:44:00 -08:00
Jim Miller
434b4acb99 am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev 
* commit '90fa53318d4984dbebfa7964ae1f79f51a130932':
  Don't show keyguard until the device has been provisioned.
 2013-11-14 15:38:32 -08:00
Jim Miller
90fa53318d Merge "Don't show keyguard until the device has been provisioned." into klp-dev 2013-11-14 23:34:32 +00: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
Dianne Hackborn
59bf3be7d1 am 2e3ede74: Merge "Maybe fix issue #11634365: Leaking restarting services" into klp-dev 
* commit '2e3ede74978d14f7bd853c3228864280d99a438e':
  Maybe fix issue #11634365: Leaking restarting services
 2013-11-14 15:00:58 -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
Dianne Hackborn
2e3ede7497 Merge "Maybe fix issue #11634365: Leaking restarting services" into klp-dev 2013-11-14 22:56:14 +00:00
Katie McCormick
9db6e7c6d0 am fb828c8c: Merge "Doc Update: add immersive mode to sysui class." into klp-docs 
* commit 'fb828c8cc5deaeaf523fee219196b8759e0bfb33':
  Doc Update: add immersive mode to sysui class.
 2013-11-14 22:50:27 +00:00
Katie McCormick
fb828c8cc5 Merge "Doc Update: add immersive mode to sysui class." into klp-docs 2013-11-14 22:47:11 +00:00
Dianne Hackborn
ddc19e9847 Maybe fix issue #11634365: Leaking restarting services 
It looks like we could add services to the restart list because
they end up left in the process's list of running services after
they have been removed from the main activity list, and we can
trip up on them there when the app is being force stopped.

Change-Id: I79805b67fcf5b593430dc5c856c97927e1a54a57
 2013-11-14 14:32:17 -08:00
Jim Miller
299422baeb Don't show keyguard until the device has been provisioned. 
This fixes a bug where we'd show keyguard on top of setup.

Fixes bug 11689756

Change-Id: I38ecdafc00fc34fdd79e3ac517042a1e5eea93de
 2013-11-14 14:15:02 -08:00
Katie McCormick
467f5db879 Doc Update: add immersive mode to sysui class. 
Change-Id: I809d95e14b04099d40302b03ca75a7f8f671c22c
 2013-11-14 14:12:58 -08:00
Jean-Michel Trivi
dc6da58aa7 am 2a96fc1f: Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev 
* commit '2a96fc1f516f7ac7fcbf5bd8c8c4fe8c7b2a8a7f':
  Fix RemoteController update in RemoteControlClient registration
 2013-11-14 13:42:27 -08: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
Jean-Michel Trivi
2a96fc1f51 Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev 2013-11-14 21:32:41 +00:00
Joe Fernandez
500ae9a311 Merge "Removing quotes from page.tags values" 2013-11-14 21:10:18 +00:00
Joe Fernandez
33baa5ad7d Removing quotes from page.tags values 
Change-Id: I9e12079568ef7be8574743a34856ed2839e1e76a
 2013-11-14 21:00:10 +00:00
Craig Mautner
8e975be598 Allow next app transition to change when screen is off. 
Prior to this change any attempts to set the app transition when the
screen was off would fail. That would cause the
SOFT_INPUT_IS_FORWARD_NAVIGATION flag to be incorrect when launching
an activity such as the alarm before the screen turns on.

Without SOFT_INPUT_IS_FORWARD_NAVIGATION in the correct state the
android:windowSoftInputMode="stateHidden" attribute would be
mishandled leaving an IME on the screen along with the alarm activity.

Fixes bug 10817166.

Change-Id: I8ad97e67ebab2069e753e957b5d253e36dcdd3e5
 2013-11-14 12:42:08 -08:00
Scott Main
92caa0c7aa am c5cdd541: remove device list for nexus devices, clarify its needed for adb 
* commit 'c5cdd5411204632494c77d7638acd21b19b16c88':
  remove device list for nexus devices, clarify its needed for adb
 2013-11-14 20:40:23 +00: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
c2877079e9 Merge "Resolve build breakage for merge of fix to b/11559103" 2013-11-14 19:59:01 +00: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
Scott Main
c5cdd54112 remove device list for nexus devices, clarify its needed for adb 
Change-Id: Ia4ec153e09a0644eeaeb1f78150b795b74afdf80
 2013-11-14 11:48:43 -08:00
Scott Main
4c0278f406 am bcad8540: am 91d60268: am a48de700: Merge "clarification to the uses-configuration tag to discourage its use." into klp-docs 
* commit 'bcad85406556e566121ae7fe36f96895bb6c5094':
  clarification to the uses-configuration tag to discourage its use.
 2013-11-14 11:28:37 -08:00
Scott Main
bcad854065 am 91d60268: am a48de700: Merge "clarification to the uses-configuration tag to discourage its use." into klp-docs 
* commit '91d6026894cd118f1fa1236c28c8384272ea7421':
  clarification to the uses-configuration tag to discourage its use.
 2013-11-14 11:25:19 -08:00
Scott Main
91d6026894 am a48de700: Merge "clarification to the uses-configuration tag to discourage its use." into klp-docs 
* commit 'a48de70003219d042ecc03f67561965ffd6bb02e':
  clarification to the uses-configuration tag to discourage its use.
 2013-11-14 19:20:16 +00:00
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