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

150174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sreeram Ramachandran
e7df34e01d Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev 2014-09-08 23:28:48 +00:00
Michael Wright
f615926494 Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev 2014-09-08 23:22:28 +00:00
Michael Wright
8e3b4d41e3 Merge "Add FEATURE_GAMEPAD." into lmp-dev 2014-09-08 23:21:49 +00:00
Michael Wright
68f92691d0 Merge "Allow wake keys to wake dozing device." into lmp-dev 2014-09-08 23:14:13 +00:00
Michael Wright
58d90c18ec Merge "Remove unused variables from UsbHostManager." into lmp-dev 2014-09-08 23:13:43 +00:00
Michael Wright
6faa6759cd Add FEATURE_GAMEPAD. 
This allows micro-consoles or other devices to signify that there's a
game controller in the box, even if the user hasn't connected it.

Change-Id: Ie5e2cf69f777ebe84abb83f34c9ed63d9555deff
 2014-09-08 16:08:18 -07:00
Ihab Awad
9802f0d025 Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev 2014-09-08 23:05:46 +00:00
Robert Ly
73f41d9127 am 718803f5: am aa19f1fc: am b5a21ad3: 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"" 
* commit '718803f52e7311af2500c0e4ee9aacc2c43882e2':
  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""
 2014-09-08 22:57:17 +00:00
Robert Ly
718803f52e am aa19f1fc: am b5a21ad3: 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"" 
* commit 'aa19f1fccb12eb141af92837aded0478006ab935':
  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""
 2014-09-08 22:51:20 +00:00
David Friedman
cf0a6c1a5c am 7eabd92a: 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 '7eabd92a14d8804092ffdef8235ecfdae72abef9':
  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:50:16 +00:00
David Friedman
52fd418902 am a4c038a7: 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 'a4c038a72ad28511f359667cb4ffab31fc0375b2':
  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:49:58 +00:00
Robert Ly
aa19f1fccb am b5a21ad3: 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"" 
* commit 'b5a21ad3fba1d8d3b096a0d685d71c148fefa11b':
  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""
 2014-09-08 22:43:42 +00:00
RoboErik
4f60f81b71 Merge "Possible fix for dead handler in Music button event sending" into lmp-dev 2014-09-08 22:35:32 +00: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
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
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
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
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
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
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
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