143700 Commits

Author SHA1 Message Date
Terry Heo
c0c3dc4ee3 Merge "TIF: Add @SystemApi to TvStreamConfig" into lmp-dev 2014-07-24 16:04:26 +00:00
Terry Heo
b6437cd0ed TIF: Add @SystemApi to TvStreamConfig
To fix broken build of xts

Change-Id: Iefb94c1a7211e6b0a9ae64b78ba6b3999dd8d366
2014-07-25 10:10:47 +09:00
Alan Viverette
50418d3a44 Fix preference panel style in DialogWhenLarge
BUG: 16550946
Change-Id: Ic419c9f6328b50383ca0ad09a1c1014129256b99
2014-07-25 01:02:04 +00:00
Zhijun He
dd3bcd7bb7 Merge "MediaFormat: add capture rate key" into lmp-dev 2014-07-24 22:06:48 +00:00
Zhijun He
86c545ea8c MediaFormat: add capture rate key
Change-Id: I2f7dd244d41d52aab6a172ae5df3e1fce3edd694
2014-07-25 00:52:42 +00:00
Christopher Tate
b9583c9d93 Turn on debugging override of idle time
'adb shell am idle-maintenance' has traditionally been used to force
the system to consider itself to be in an "idle" state.  Unfortunately
the new Job Manager hadn't yet been aware of this.  Rectify the situation.

Also fixes a bug in debug logging that would cause a system server
crash under certain race circumstances.

Change-Id: I8a29bd7757924f8e464865235c344233fc03d8c3
2014-07-25 00:30:07 +00:00
Dongwon Kang
2380f36e67 Merge "Disable TvInputManagerService on non-TV devices." into lmp-dev 2014-07-24 16:05:03 +00:00
Aravind Akella
0dcebb9246 Merge "Define TYPE_PICK_UP_GESTURE." into lmp-dev 2014-07-24 15:36:51 +00:00
Aravind Akella
96eb62c3b9 Define TYPE_PICK_UP_GESTURE.
Change-Id: Ic2c7963352ff954884ce05a0a3a71516ed417140
2014-07-24 17:45:05 -07:00
Jeff Davidson
d127367c40 Merge "Fix system API stub build." into lmp-dev 2014-07-24 22:43:15 +00:00
Jeff Davidson
2302049679 Fix system API stub build.
TvInputManager.captureFrame is @SystemApi and depends on
TvStreamConfig which must also be made @SystemApi.

Change-Id: I8a4a10d77d4cfb80674c4ac8aa7a8ed119881aa0
2014-07-24 18:06:56 -07:00
Behdad Esfahbod
4774470e20 Merge "Add letter-spacing to Paint and TextView" into lmp-dev 2014-07-24 15:36:21 +00:00
Behdad Esfahbod
fa80f7491d Add letter-spacing to Paint and TextView
New API is hidden.

Bug: 15594400
Change-Id: I5cbe7aebef0b7280eb13924f2a706c0cb4a4688e
2014-07-24 18:46:07 -04:00
John Reck
ad2947a7e7 Merge "fix build" into lmp-dev 2014-07-24 15:36:21 +00:00
John Reck
73e8205f75 fix build
Change-Id: I597255b2b311b7daec7ffe537f62ee78eace50be
2014-07-24 14:46:54 -07:00
Yao Chen
80bb169d0f Use a sequence number for thumbnail callback.
Change-Id: I27888cd0437b4f654cb29371b7d86b9341d84ae9
2014-07-24 21:40:40 +00:00
John Reck
1aa5d2d706 Fix ALL compile warnings
All warnings/errors fixed for GCC & Clang

Change-Id: I2ece3a136a5ae97a9acc3069537ed986238b5fd3
2014-07-24 14:28:08 -07:00
George Mount
71d34ec5be Merge "Fix no transition when only shared element exists." into lmp-dev 2014-07-24 20:48:02 +00:00
George Mount
b4c5d7bf21 Fix no transition when only shared element exists.
Bug 16245703

Change-Id: Ie31baaf7f58038fc79ffca0206ce3bec0ef64cb4
2014-07-24 13:19:51 -07:00
Justin Morey
5a99ee3334 Merge "Fix build" into lmp-dev 2014-07-24 15:36:51 +00:00
Justin Morey
b5deda7382 Fix build
Change-Id: I8790b274864610b7e00d7ea12efe96b3b826301f
2014-07-24 10:53:40 -05:00
Kenny Guy
4dcb0dc453 Load package information from correct user.
Handle case where a package is only installed
for secondary user.

Bug: 15983201
Change-Id: I6733011c59e6d08d275dc761660d38b709051d79
2014-07-24 15:49:18 +00:00
Robert Greenwalt
41f9696d51 Merge "Fix DUN-based tethering." into lmp-dev 2014-07-24 15:36:21 +00:00
Robert Greenwalt
fab50167a8 Fix DUN-based tethering.
It was calling into dead ConnectivityService code rather than using
the new ConnectivityManager shim code.

bug:15221541
Change-Id: I1e3eea8a658a162ce36673ed1cf7b1e7e4372c42
2014-07-24 14:39:51 -07:00
Prashant Malani
b4dcc64fe6 Merge "Revert "Remove circular mask"" into klp-modular-dev 2014-07-24 15:36:14 +00:00
Jean-Michel Trivi
e19dfacb74 Merge "Remove MediaFocusControl persisting media button receiver" into lmp-dev 2014-07-24 15:36:09 +00:00
Jean-Michel Trivi
f2bbad1e76 Remove MediaFocusControl persisting media button receiver
MediaFocusControl doesn't handle media button receivers anymore,
 so it should read and persist a receiver, and monitor
 package addition/removals.
Also involved a security vulnerability, see bug

Bug 15428797

Change-Id: Ia2be01b20dc4a9820cc0cd3d0605ac03770b266b
2014-07-24 10:06:13 -07:00
Narayan Kamath
cf0cf47545 Merge "Handle renderscript apps in the system partition correctly." into lmp-dev 2014-07-24 15:36:04 +00:00
George Mount
51c014843a Fix Monkey NPE.
Bug 16135577

Change-Id: If2ea474fd9ca9232fec325deed0e9b9b806595f6
2014-07-25 13:59:37 +00:00
Dan Sandler
13b8159e90 Do not colorize bare notification icons in the overflow.
Change-Id: I3377a7d6024e495172a5ccefde1beaa46ec88283
2014-07-25 13:36:37 +00:00
Adrian Roos
2daf7a056d Merge "Remove brightness dialog timeout" into lmp-dev 2014-07-24 15:36:05 +00:00
Jorim Jaggi
4e0880e395 Synchronize album fade away with Keyguard dismissal
Change-Id: I7aaa6213f6070f0db14131a248a62b317309a3bf
2014-07-25 13:09:37 +00:00
Adrian Roos
5a46f8c98a Remove brightness dialog timeout
Required to make the dialog accessible.

Bug: 14116737
Change-Id: Ib126068672cdafccd4470de47e11e2b1efd90e72
2014-07-25 15:03:26 +02:00
Kenny Guy
237aecd18d Change getBadgedLabelForUser to use CharSequence
Bug: 16401636
Change-Id: I45410a6293007dd789d6770d63397824559b756e
2014-07-25 10:12:11 +00:00
Adrian Roos
c3d5ead837 Merge "Restart trust agents when updated or when they are dead" into lmp-dev 2014-07-24 15:36:04 +00:00
Adrian Roos
c5f95cea26 Restart trust agents when updated or when they are dead
ActivityManager restarts the trust agent service for us
when it gets killed automatically. This does not apply
when its process crashes too often or when its package
gets updated however.
To catch the update case, the trust agent connection
is removed as soon as the package disappears, and then
readded when the new package appears.
To catch the repeated crashing case, the connection is
reset if it hasn't successfully connected for several minutes.

Also adds a button to SampleTrustAgent to simulate a crash.

Bug: 16137258
Change-Id: I1b18fc7a3025e23e25ca1623b6af658d5430a94b
2014-07-24 21:44:02 +02:00
Nicolas Prevot
0417982b65 Merge "Migrate extras to ClipData for image/video capture intents." into lmp-dev 2014-07-24 15:36:05 +00:00
Nicolas Prevot
d1c99b1fe8 Migrate extras to ClipData for image/video capture intents.
The intents ACTION_IMAGE_CAPTURE, ACTION_IMAGE_CAPTURE_SECURE and ACTION_VIDEO_CAPTURE are now handled in a way
similar to ACTION_SEND and ACTION_SEND_MULTIPLE.
Migrate the uri in the EXTRA_OUTPUT extra to clipData, and add the flag GRANT_WRITE_URI_PERMISSION.

The userIds are now added to extra uris in the process receiving the intent, (not in the system process), because the
system process may not be able to parcel/unparcel the extras.

BUG: 15534203

Change-Id: I8f79666b726bc6d7745bf777ad3c7518945c5cc3
2014-07-25 10:22:19 +01:00
Hector Dearman
2caf106790 Merge "Add documentation for CookieManager defualts" into lmp-dev 2014-07-24 15:36:05 +00:00
Hector Dearman
9f59526f03 Add documentation for CookieManager defualts
Documents the defualt settings of acceptCookies and acceptFileSchemeCookies.

The current defaults:
                            <L       >=L
acceptCookies           |    y   |    y   |
acceptThirdPartyCookies |    y   |    n   |
acceptFileCookies       |    n   |    n   |

Bug: 11575158
Change-Id: Ia6cb71bf80608cb2ea8049192f33616e57c15801
2014-07-25 09:37:58 +00:00
Baligh Uddin
7e75d21c65 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 15:35:58 +00:00
Craig Mautner
6714e86a54 Refactor screen blocking logic.
Because of the call to turn on the screen introduced in ag/495255
is now made earlier we may not have sent the wakeup broadcast by
the time the windows have all drawn. In such a case onScreenOn()
did not release the wakelock and the screen stayed off.

This change ensures that no matter the timing of onScreenOn()
the wakelock will be released but only for the onScreenOn()
called in response to the most recent screen on transition.

Fixes bug 16404078.

Change-Id: Ic1e3e61e16c1fc34d4ec657e0e53ac49a05ca6a4
2014-07-24 20:49:57 +00:00
Alan Viverette
96335e3543 Merge "Remove the max ripple count exceeded warning" into lmp-dev 2014-07-24 15:36:09 +00:00
Alan Viverette
e5d6cf85e2 Remove the max ripple count exceeded warning
BUG: 16543509
Change-Id: I84ec8e01136d1f0f34c6153d8ef7936de547746e
2014-07-24 13:45:46 -07:00
Alan Viverette
61968a93a8 Update icons for search and back
BUG: 16539661
Change-Id: If914e812841d2844a4fa50cc5a863615531371a2
2014-07-24 13:42:40 -07:00
Alan Viverette
0da25b9298 Merge "Update icons for search and back" into lmp-dev 2014-07-24 15:35:58 +00:00
Adam Lesinski
d4bd75be4f Merge "Add <feature-group> tag and change aapt badging" into lmp-dev 2014-07-24 15:36:09 +00:00
Prerepa Viswanadham
5bec5af971 cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
Change-Id: Ia58a46392157e274f8fc4696e8e25af480eb2d2a
2014-07-24 19:28:12 +00:00
Svetoslav
f7c42c5067 Updated accessibility nodes not properly cached.
We have an accessibiliy node info cache in the process of each
accessibility service. Sometimes the cached node changes and
in this case we have evict from the cache the sub-trees rooted
at children that are no longer present. There was bug where if
none of the children is present anymore we did not evict their
sub-trees.

Also the verification logic was not stopping if a duplicate
node is seen potentially getting into an infinite loop.

bug:15729762

Change-Id: I7adf4f0a1bde07b385556d9acdded5059231f1f3
2014-07-24 19:24:42 +00:00
John Spurlock
747a69965e Merge "Volume: force-dismiss panel when the screen turns off." into lmp-dev 2014-07-24 15:36:51 +00:00