Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,638 Commits 3 Branches 0 Tags
69bfc60ae07e2eba94bf73098d3572bec725e208
Commit Graph

32594 Commits

Author SHA1 Message Date
Jeff Sharkey
69bfc60ae0 am cb8c4501: am d92dd8ff: am fcd8a39e: Merge "Install providers enabled after app started." into klp-dev 
* commit 'cb8c4501d47ac492d48fbdd3b8e599fe620f2949':
  Install providers enabled after app started.
 2013-10-09 10:57:15 -07:00
Jeff Sharkey
cb8c4501d4 am d92dd8ff: am fcd8a39e: Merge "Install providers enabled after app started." into klp-dev 
* commit 'd92dd8ffcf3e7bce7d331e7ae9101ccba02baa67':
  Install providers enabled after app started.
 2013-10-09 10:53:35 -07:00
Jeff Sharkey
dd97f4233f Install providers enabled after app started. 
When an app has already been started, and a ContentProvider component
is enabled with DONT_KILL_APP, use the existing ProcessRecord to
install the provider.

Bug: 11118692
Change-Id: I990f18b337eb19768ee1db895f1e2eb982046cce
 2013-10-08 17:02:26 -07:00
Nick Kralevich
23c888acab am fa06d03e: am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit 'fa06d03edf7b40f62615c58233dbdf135bac11df':
  Fix App Ops permission mapping structure.
 2013-10-08 16:02:54 -07:00
Jeff Sharkey
f22abb961b am ac50f60d: am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit 'ac50f60da6ae9943321d4fe945e81d14dff0d4c2':
  Add secondary external storage support.
 2013-10-08 16:02:40 -07:00
Dianne Hackborn
e02c3eec84 am 19a6a86a: am c35ae6e7: am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 
* commit '19a6a86ae148b3ee15ef7499302e9ed7c1bea682':
  Wrong argument: handleUnstableProviderDiedLocked
 2013-10-08 16:02:34 -07:00
Alan Viverette
e94ec3e79a am 57cc6283: am 76597552: am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev 
* commit '57cc628355e434d4b313e9b60e1a68a0643fda04':
  Fix HIDE_DESCENDANTS accessibility importance mode
 2013-10-08 16:02:29 -07:00
Daniel Sandler
32bc10303c am 4be3db70: am f3a56199: am 40bacdf4: Merge "Don\'t wake users up with low battery sounds." into klp-dev 
* commit '4be3db7018154406ab74e029482a7d82dbcd3a5a':
  Don't wake users up with low battery sounds.
 2013-10-08 16:02:16 -07:00
Nick Kralevich
fa06d03edf am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit '0b8fd029c052784d4adee940eaa904a339db6716':
  Fix App Ops permission mapping structure.
 2013-10-08 14:33:40 -07:00
Nick Kralevich
0b8fd029c0 am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit 'a299862dd2d46fda54678df07db66bef1a63bb9b':
  Fix App Ops permission mapping structure.
 2013-10-08 14:30:11 -07:00
Jeff Sharkey
ac50f60da6 am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit '58ff8af53a8378ee50375b039c390ca7f0a29126':
  Add secondary external storage support.
 2013-10-08 14:12:37 -07:00
Jeff Sharkey
a6af40cda2 Merge "Add secondary external storage support." into klp-dev 2013-10-08 21:05:36 +00:00
Dianne Hackborn
19a6a86ae1 am c35ae6e7: am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 
* commit 'c35ae6e784dcf1a3480fbcc12e09d51bdffce686':
  Wrong argument: handleUnstableProviderDiedLocked
 2013-10-08 13:36:53 -07:00
Dianne Hackborn
c739a76598 Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 2013-10-08 20:29:47 +00:00
Alan Viverette
57cc628355 am 76597552: am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev 
* commit '76597552805f810ff7de15f6fad72a0a89ff5724':
  Fix HIDE_DESCENDANTS accessibility importance mode
 2013-10-08 13:19:31 -07:00
Alan Viverette
3a407fad35 Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev 2013-10-08 20:14:21 +00:00
Daniel Sandler
4be3db7018 am f3a56199: am 40bacdf4: Merge "Don\'t wake users up with low battery sounds." into klp-dev 
* commit 'f3a56199a526bb21f4196e35a355d8476e4604ce':
  Don't wake users up with low battery sounds.
 2013-10-08 13:07:53 -07:00
Jeff Sharkey
44cbdec292 Add secondary external storage support. 
When SECONDARY_STORAGE is defined by the hardware configuration,
include those paths in the new getExternalCacheDirs() and
getExternalFilesDirs() APIs.  Give secondary volumes valid state
until vold reports back.

Bug: 10330128, 10330229
Change-Id: Ifa55bfda47fd7c750f462dd26c98792ad462ab91
 2013-10-08 12:57:11 -07:00
You Kim
bc74de6722 Wrong argument: handleUnstableProviderDiedLocked 
mProvider is HashMap<ProviderKey, ProviderClientRecord>. String
is not correct object for KEY. Complete removal using iterator.

Bug: 11086495

Change-Id: I51e4576544ef02ede6f96938689dd4e43ec6eb4f
 2013-10-08 12:22:30 -07:00
Daniel Sandler
dea6462aab Don't wake users up with low battery sounds. 
Battery sounds will always play when the screen is on, and
then for Settings.Global.LOW_BATTERY_SOUND_TIMEOUT
milliseconds after the screen goes off. After that, low
battery alerts will be pushed out the airlock until the
screen comes back on again.

If battery sounds are suppressed via this mechanism you'll
see a log line like:

	V/PowerUI ( 3161): screen off too long (5779ms, limit
	5000ms): not waking up the user with low battery sound

The default value of LOW_BATTERY_SOUND_TIMEOUT is a settings
provider resource: R.integer.def_low_battery_sound_timeout.

Bug: 10487557
Change-Id: Iddd42038aa630631dc8f1833f20fcc5a0c646681
 2013-10-08 17:37:06 +00:00
Torne (Richard Coles)
d724ff6fd7 am 0544b872: am facf26c0: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev 
* commit '0544b87249ff2f58806c2464f87afcb3c32c62e8':
  Hide Experimental WebView from dev settings DO NOT MERGE
 2013-10-08 10:22:01 -07:00
Jonathan Dixon
be706eb1c1 Hide Experimental WebView from dev settings DO NOT MERGE 
Bug 10427705

The persist.webview system property is no longer needed, so removed too.

Change-Id: I8f02736469464b52636f3d59ec8537d11766d39f
 2013-10-08 17:59:13 +01:00
Svetoslav Ganov
91adc9ff6f am 98b07f4e: am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 
* commit '98b07f4e1ea7c5a861c2c66278816ab6c8fd02d1':
  Do not do a layout and write while a cancellation is in progress.
 2013-10-08 09:44:18 -07:00
Svetoslav Ganov
98b07f4e1e am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 
* commit 'b02b14b21e46c531ae726094413f036ae36c56f9':
  Do not do a layout and write while a cancellation is in progress.
 2013-10-08 09:39:08 -07:00
Svetoslav Ganov
ef4a6f8662 Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 2013-10-08 16:34:27 +00:00
Alan Viverette
24cafbc56c Fix HIDE_DESCENDANTS accessibility importance mode 
Ensures accessibility framework is notified when subtree visibility
changes as a result of hiding descendants. Fixes collision between
HAS_TRANSIENT_STATE flag and IMPORTANT_FOR_ACCESSIBILITY mask.

BUG: 11087525
Change-Id: I92dba27350970a09e76b5a878c7604ea06cae197
 2013-10-07 18:28:45 -07:00
Alan Viverette
550b89e6de am 80fad292: am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit '80fad292318ac2e1e76435bb8334017a702a62d7':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:17:37 -07:00
Alan Viverette
80fad29231 am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit '6d774ac6049de8bf347a735eb67c491bb2623aa1':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:15:05 -07:00
Alan Viverette
bdae814816 Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 2013-10-08 01:09:00 +00:00
Alan Viverette
516f953a82 resolved conflicts for merge of e4ccb864 to master 
Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22
 2013-10-07 18:05:09 -07:00
Alan Viverette
e4ccb864e8 am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb':
  Ignore certain WindowManager flags when touch exploration is enabled
 2013-10-07 17:54:42 -07:00
Alan Viverette
6930d3805e Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 2013-10-08 00:47:23 +00:00
Svetoslav Ganov
db63677c7c Do not do a layout and write while a cancellation is in progress. 
While printing the app gets callbacks to do a layout and a write. Since
these operations can take a very long time they are implemented in a async
fashion. For example, if there is a layout request while we are still doing
a layout, we ask the application to cancel the previous layout. The problem
was that we were not waiting for the cancellation result before calling
the subsequent layout. Hence, the app ends up having to do two layouts at
the same time which breaks the printing contract. Same for write.

bug:11118426

Change-Id: If7b191c44387d88d5cec195d1785a47f986965ba
 2013-10-07 17:13:01 -07:00
Amith Yamasani
632b7dc884 am 6db7f39b: am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev 
* commit '6db7f39ba573fd087c79da9585801c3f277ac8fc':
  Don't backup/restore ringer mode
 2013-10-07 17:09:04 -07:00
Amith Yamasani
6db7f39ba5 am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev 
* commit '1eae610981ea1d6f7816d333fb98519f2459a254':
  Don't backup/restore ringer mode
 2013-10-07 17:03:00 -07:00
Alex Ray
e3a8a0f573 am bb478e6d: am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 
* commit 'bb478e6da0a80da5a9dd00a005d00c40e31cfc18':
  camera2: describe non-full hw level optional tag entries
 2013-10-07 17:01:21 -07:00
Adam Powell
80da140cc4 am 266b3026: am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar 
* commit '266b3026c42ed3ba0feedd9abe3e3bb6932c2f23':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
 2013-10-07 17:01:16 -07:00
Amith Yamasani
1b5a2e630a Merge "Don't backup/restore ringer mode" into klp-dev 2013-10-07 23:57:36 +00:00
Alex Ray
bb478e6da0 am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 
* commit '783d3c1ed1989e820437fec4224079d8c860ad36':
  camera2: describe non-full hw level optional tag entries
 2013-10-07 16:31:24 -07:00
Adam Powell
266b3026c4 am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar 
* commit '20ba658bdb32cb6f02cb12d9f94419e29420f9f5':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
 2013-10-07 16:27:29 -07:00
Alex Ray
69c66f4203 Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 2013-10-07 23:25:24 +00:00
Adam Powell
31049d76c5 Use SCREEN Xfermode for keyguard badges; update SeekBar 
Plumb through the necessary API features through Drawables and
ImageView but leave it hidden for now pending future API review and
plumbing through the rest of the framework Drawable implementations.

Update SeekBar assets used for keyguard transport control.

Set selected status directly instead of finding views by id.

Bug 10531608
Bug 10784913

Change-Id: Ia38bd04ad1bc26e9e6da1dda8a374c9ba3ceccb3
 2013-10-07 16:14:17 -07:00
Igor Murashkin
3f7da6a32c am b7354bab: am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 
* commit 'b7354bab1500f7eec9360fbabf0474af0dfaad68':
  camera2: Workaround for null FACE_DETECT_MODE crashing
 2013-10-07 15:46:46 -07:00
Igor Murashkin
b7354bab15 am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 
* commit 'c80938266fcdd14f2bb749d1a9dbb4af7dbde83f':
  camera2: Workaround for null FACE_DETECT_MODE crashing
 2013-10-07 15:43:19 -07:00
Igor Murashkin
46ea9b0b04 Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 2013-10-07 22:38:37 +00:00
Igor Murashkin
e37885a8a3 camera2: Workaround for null FACE_DETECT_MODE crashing 
Bug: 11118679
Change-Id: Id9b055744f6a2f502857b4cc0c5badb46b44a1f8
 2013-10-07 15:29:58 -07:00
Svetoslav Ganov
82fb4460a4 am 5ffb19ae: am f30b6474: am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 
* commit '5ffb19aed5826bd78ca5861ffffaa814d8e4169a':
  The undefined media sizes for both orientations not properly constructed.
 2013-10-07 15:28:19 -07:00
Svetoslav Ganov
5ffb19aed5 am f30b6474: am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 
* commit 'f30b6474408dd27a6fd13710f352211a8a39669b':
  The undefined media sizes for both orientations not properly constructed.
 2013-10-07 15:27:02 -07:00
Amith Yamasani
77c8831ff6 Don't backup/restore ringer mode 
Backing it up might result in restoring a new device to a silent,
or vibrate-only state, which is not a good out-of-box experience.

Bug: 11025824
Change-Id: I5b63fd3da012ffc4253338aae31527302a2d276a
 2013-10-07 15:23:16 -07:00
Svetoslav Ganov
c2d6e51d6c Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 2013-10-07 22:21:52 +00:00