RoboErik
4f60f81b71
Merge "Possible fix for dead handler in Music button event sending" into lmp-dev
2014-09-08 22:35:32 +00:00
Alan Viverette
77c180a513
Use correct row/column order in list and grid CollectionItems
...
BUG: 17427260
Change-Id: Ie90767100bc38fa903173ae150b9807203230020
2014-09-08 15:30:34 -07:00
Robert Ly
b5a21ad3fb
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html ""
...
This reverts commit 4186379a2a37123d31ce5d1aff1facc8e7dfbfd3.
Change-Id: I34a7b8689362053c0ad8124eaa3f40a5c282bc80
2014-09-08 22:30:09 +00:00
Michael Wright
f5e56d41a2
Remove unused variables from UsbHostManager.
...
Change-Id: I68067b69de077667482633cc6ecd97ee94ecb699
2014-09-08 15:27:42 -07:00
David Friedman
7eabd92a14
am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html "
...
* commit '3207948444ed39b867c14cfc314b8caaf60fe571':
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html "
2014-09-08 22:26:59 +00:00
David Friedman
a4c038a72a
am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
...
* commit '7e8786d9755526a2d29c10c60759eb1c290afa38':
NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
2014-09-08 22:26:53 +00:00
Jinsuk Kim
781041239f
CEC: Stub MHL Controller
...
Replace MHL Controller with a stub impl
Bug: 17259897
Change-Id: Id57bac363441f72b3da3f30d31c68c6d3b502237
2014-09-09 07:23:32 +09:00
Tsuwei Chen
ff4f6c8859
Merge "Manually merge QC's change for SUPL_ES." into lmp-dev
2014-09-08 22:15:32 +00:00
David Friedman
3207948444
am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html "
...
* commit '4186379a2a37123d31ce5d1aff1facc8e7dfbfd3':
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html "
2014-09-08 22:13:09 +00:00
David Friedman
7e8786d975
am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
...
* commit 'c6142d97d79bc6a5ce2bb77fce9ae5d988f49542':
NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
2014-09-08 22:13:05 +00:00
Ihab Awad
a64627c2d3
Enable (@hidden) video connection support for RemoteConnections
...
Bug: 16958934
Change-Id: I2c618743a689303f1bec190da53a1ec42d759370
2014-09-08 15:02:04 -07:00
Jean-Michel Trivi
ceb79bc31a
Prevent NotificationManagerService from using bad stream type
...
When deriving AudioAttributes from a Notification instance,
and having to use the legacy stream type field, make sure
it has a valid value, or use the default notification
attributes.
Bug 17408227
Change-Id: Icd1a122b33b8eceb1f6a177699885b0fb8a99b7c
2014-09-08 14:59:06 -07:00
David Friedman
4186379a2a
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html "
...
This reverts commit c6142d97d79bc6a5ce2bb77fce9ae5d988f49542.
Change-Id: Idc6fde822bf42300897d96fc934a94e6b9418d76
2014-09-08 21:58:22 +00:00
Deepanshu Gupta
8c766fea93
Update IntelliJ project file for IntelliJ 14
...
IntelliJ keeps reordering the options this way each time the project is
opened.
Change-Id: I0e19b5b0a858b3fa9a1134b883ed5180c4ef146e
2014-09-08 14:49:49 -07:00
Andrew Lee
be5b656940
Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev
2014-09-08 21:45:41 +00:00
Yorke Lee
478f5a6212
Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev
2014-09-08 21:43:30 +00:00
Christoph Studer
6a73202e00
Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev
2014-09-08 21:26:30 +00:00
Tom Taylor
bb3b2dcafb
Merge "DO NOT MERGE - Hide new SmsManager API's dealing with SubId" into lmp-dev
2014-09-08 21:17:21 +00:00
Michael Wright
fc01f04a1c
Allow wake keys to wake dozing device.
...
The new key interception policy removed the wake status from key
presses while in the device was dozing. Since we still want to wake
from these keys by going from doze -> fully interactive, just don't
remove the wake status and allow the device to be woken up as normal.
Bug: 17422475
Change-Id: I835e51cc9c557d8ce2e8f8502d84f04aae138e79
2014-09-08 14:12:24 -07:00
Chris Wren
6db58cb0a1
Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev
2014-09-08 20:47:07 +00:00
Kenny Guy
d9037a48c6
Merge "Renaming of LauncherApps apis" into lmp-dev
2014-09-08 20:47:07 +00:00
John Spurlock
897b01b39e
Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev
2014-09-08 20:40:46 +00:00
Chris Wren
d93d5adfe7
Bring consistency to FLAG_ONLY_ALERT_ONCE semantics.
...
For updates, the sounds layer checks for existence of the flag on the
new version while the heads up was checking for the flag on the
old version.
Both now agree to check the new version.
Bug: 14255617
Change-Id: Ib617df11f0dea17b5dfdf2ef6330bdbd18032ac6
2014-09-08 16:40:39 -04:00
Jorim Jaggi
92cb37a027
Merge "Start all resolver activities after keyguard is gone" into lmp-dev
2014-09-08 20:38:36 +00:00
Jorim Jaggi
a1eeadee63
Apply color to auto-redacted notification
...
Bug: 17419964
Change-Id: I82010fe9c2bb2fd0a2300a8290258c7dc13bf6a6
2014-09-08 22:34:39 +02:00
Yorke Lee
e3198b719f
Replace Calls.FEATURES_NONE with 0 (1/4)
...
Bug: 17253963
Change-Id: I9e9e56cdf4c9a60ac1e047bef0eba2ba0c8f10fb
2014-09-08 13:33:51 -07:00
John Spurlock
1564b6d8d7
Zen: Remove suppression of untagged vibrations in zen mode.
...
Bug:17313184
Change-Id: I07d24a7d9ce15160a4990391c53d7d6309a13c3e
2014-09-08 16:16:25 -04:00
Craig Mautner
ff56885db3
Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev
2014-09-08 20:12:35 +00:00
RoboErik
9ff7dda93e
Possible fix for dead handler in Music button event sending
...
I'm still attempting to root cause, but this is a potential fix. I
suspect the callback is getting registerd on a looper that isn't the
main looper which is then getting killed at some point. This change
will make all legacy callbacks happen on the main looper, which should
prevent the state.
bug:17420281
Change-Id: Ia78e694b32b24398d3c09f49d12632755ef45597
2014-09-08 13:11:55 -07:00
Kenny Guy
8942bcd6ea
Remember userId when stripping / rebuilding notification.
...
ApplicationInfo.uid isn't enough because when system
posts notifications it Context.getUserId doesn't match
userId bit of ApplicationInfo.uid, so put back the
mOriginatingUserId.
Bug: 17002733
Change-Id: Ie3d8de121255bcb551cbe80c263e74f1a60b6f1c
2014-09-08 21:09:47 +01:00
Winson Chung
19d62382d0
Ensuring that the start delay matches the transition delay. (Bug 16987565)
...
- Also ensure that the empty text is normal weight
Change-Id: I3227a62fcb39910a402b13f42a6cb9e418f992aa
2014-09-08 20:08:01 +00:00
Andreas Gampe
6b0ed64fb8
Frameworks/base: Add native bridge post-fork initialization
...
(cherry picked from commit d7746a8b65ee4690427ed798816f970218578fa3)
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-08 13:07:59 -07:00
Kenny Guy
48f0b48555
Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev
2014-09-08 20:02:10 +00:00
Tom Taylor
02dc08834b
DO NOT MERGE - Hide new SmsManager API's dealing with SubId
...
Bug 17422049
Change-Id: I8acc4448e1c5ed665f6df48282afa71fcec54f33
2014-09-08 20:00:03 +00:00
Jorim Jaggi
f98fbb710b
Merge "Restrict line count for BigTextStyle" into lmp-dev
2014-09-08 19:46:45 +00:00
Jorim Jaggi
a3bb226b08
Merge "Fix invisible low prio notifications in SHADE_LOCKED" into lmp-dev
2014-09-08 19:34:44 +00:00
Jason Monk
0c37ba3188
Add user-specific playSoundEffect and use in NavBar
...
Add a hidden version of playSoundEffect that takes a userId to
get the correct setting as to whether sound effects should play
or not.
Bug: 15106706
Change-Id: I5c0b74081fd00732a43fe42a76d33d05197333d0
2014-09-08 15:34:23 -04:00
Tom O'Neill
9f8c80df1d
Merge "Fix a STOPSHIP" into lmp-dev
2014-09-08 19:29:57 +00:00
vandwalle
171575266c
Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change" into lmp-dev
2014-09-08 19:22:15 +00:00
Andrew Lee
3085a6c739
Rename methods/variables on PhoneAccount for API cleanup.
...
+ Rename from Handle to Address.
+ Rename from SubscriptionNumber to SubscriptionAddress.
+ Store the subscription address as a Uri.
Bug: 17390175
Bug: 17329632
Change-Id: I67514d89f0e7c81f74bef352df7a55cc422d1c71
2014-09-08 12:00:05 -07:00
Kenny Guy
c2a4060005
Revert "Ensure ApplicationInfo is for correct user for system/android package."
...
Cache in ActivityThread means this still doesn't make sure we will
get an ApplicationInfo for the user being requested. So reverting.
This reverts commit 4a3b8aa08d743b28d53b327597abf03a925641f2.
Bug:17002733
Change-Id: Ie40eb31c4074cea09de3d6a41fe38b14e00eb059
2014-09-08 18:53:56 +00:00
David Friedman
c6142d97d7
NDKr10b changes to be published to DAC NDK page.
...
Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
Change-Id: I559068eb1567bc03f69cadade5073f419635ad69
2014-09-08 11:45:27 -07:00
Svet Ganov
2bb02c799c
Merge "Clicking on partially coverd views by other views or windows." into lmp-dev
2014-09-08 18:45:04 +00:00
Dharmesh Mokani
2b02f88737
Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev
2014-09-08 18:43:14 +00:00
Jason Monk
100d9471ab
Merge "Update downtime to handle TimeZone change" into lmp-dev
2014-09-08 18:33:09 +00:00
Craig Mautner
d2a38c7854
Merge "Ignore finishing activities when fetching the top" into lmp-dev
2014-09-08 18:32:01 +00:00
George Mount
214e7ad175
Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev
2014-09-08 18:25:03 +00:00
Jason Monk
95e71085e2
Merge "Add VPN Key to signal icons" into lmp-dev
2014-09-08 18:15:38 +00:00
Nancy Chen
6faad7e5b6
Merge "Make changes to Telecomm API per review guidelines." into lmp-dev
2014-09-08 17:38:58 +00:00
Nicolas Prevot
6e412adaa7
Allowing a ContentProvider to have a null authority.
...
In this case, it will not be possible to query it with any uri.
BUG: 17414813
Change-Id: I76e8ad91539904f3c52b5a3436b2f1bd5e4d0fdf
2014-09-08 18:28:43 +01:00