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

152204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
d4241d49d6 am 1c5d160b: Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev 
* commit '1c5d160baea5d7e37f605c2756cbe60c63d36469':
  Add FEATURE_GAMEPAD to current.txt
 2014-09-09 00:18:48 +00:00
Michael Wright
b62bb77931 Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev 2014-09-09 00:07:29 +00:00
Wink Saville
78606e5997 am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev 
* commit '26207b53a82f1e8f3d72eaf36bd69dbcb06833fc':
  Change getCurrentPhoneType to SystemApi
 2014-09-09 00:05:54 +00:00
Amit Mahajan
35fe84d682 am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-dev 
* commit '034fe21c638960d8d67711f446c818b93e41641e':
  Assisted dialing support of MO SMS
 2014-09-09 00:05:50 +00:00
Wink Saville
40e9f393df Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev 2014-09-09 00:00:49 +00:00
Michael Wright
3afd6e3fc6 Add FEATURE_GAMEPAD to current.txt 
Change-Id: I5c5a7910983ac3bc5850fba2dfc4d96b11fbd2f0
 2014-09-08 16:57:38 -07:00
Amit Mahajan
4009b98f73 Merge "Assisted dialing support of MO SMS" into lmp-dev 2014-09-08 23:56:31 +00:00
Amit Mahajan
57490ebdcb am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev 
* commit '1fa77bb56b47049ab90fb3b1b81f1588896bc87c':
  change the property name about IDP from 'telephony.' to 'gsm.'
 2014-09-08 23:54:29 +00:00
Chris Craik
f3e2a0b953 am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev 
* commit '2d0c82ad0a4055aa28f551b8316899903dd6531e':
  Don't track TextureLayer lifecycles in RenderState
 2014-09-08 23:54:24 +00:00
Amit Mahajan
8a4537ba23 Merge "change the property name about IDP from 'telephony.' to 'gsm.'" into lmp-dev 2014-09-08 23:52:36 +00:00
Wink Saville
96b3e61ff6 Change getCurrentPhoneType to SystemApi 
Bug: 17394367
Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683
 2014-09-08 16:52:03 -07:00
Chris Craik
2286f819ac Merge "Don't track TextureLayer lifecycles in RenderState" into lmp-dev 2014-09-08 23:47:31 +00:00
Steven Liu
db960ad188 change the property name about IDP from 'telephony.' to 'gsm.' 
'telphony.' couldn't be set successfully.

Change-Id: I8a9ee29461bf764f2b269bb81fafe83d8d5e48d9
 2014-09-08 16:47:15 -07:00
Chris Craik
8a226d24b8 Don't track TextureLayer lifecycles in RenderState 
bug:17208461

They are destroyed via finalizer-enqueued destroy method, so it's not
valid to check that they've been destroyed at gl context destruction
time.

Change-Id: I670f69825547facd5f31d44acb406418881fee00
 2014-09-08 16:44:47 -07:00
Sreeram Ramachandran
465ef3bf3a am ccfdd756: Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev 
* commit 'ccfdd756579a161f0793414da3f2bd94a5f8803d':
  Reserve NetIds 1..50 for OEM use.
 2014-09-08 23:31:34 +00:00
Michael Wright
c90d040f40 am 3b64e8dc: Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev 
* commit '3b64e8dc62ac880e7ea347ccab15bd18baef7244':
  Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST
 2014-09-08 23:31:30 +00:00
Michael Wright
76e374f47a am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev 
* commit 'd49dc106aec6441f0db0c5a181b8ae578a76f927':
  Add FEATURE_GAMEPAD.
 2014-09-08 23:31:25 +00:00
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
56156c4c3a am 56d11c6e: Merge "Allow wake keys to wake dozing device." into lmp-dev 
* commit '56d11c6e833a6c10dd462203545968ed293bb323':
  Allow wake keys to wake dozing device.
 2014-09-08 23:21:13 +00:00
Michael Wright
20fe1f97f3 am 64ae551a: Merge "Remove unused variables from UsbHostManager." into lmp-dev 
* commit '64ae551a4f26b3868c66baa362c464e109a0da44':
  Remove unused variables from UsbHostManager.
 2014-09-08 23:21:08 +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
Ihab Awad
30f608dd49 am c69b2a66: Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev 
* commit 'c69b2a66fed1b8fd1ed511d2c776fcd4e2cbd54d':
  Enable (@hidden) video connection support for RemoteConnections
 2014-09-08 23:09:23 +00:00
Robert Ly
549f4d9922 am 8414b3b9: 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 '8414b3b963562d429bf8f2d1ba21d383f7d2339f':
  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 23:09:19 +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
David Friedman
2618a52da9 am 8fd9c6eb: 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 '8fd9c6eb16a3410c941dfdc32e44049d3e77694e':
  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:58:01 +00:00
David Friedman
4b211ea8f3 am a24ba624: 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 'a24ba6244dbec1d1dea674024dd7049f93d1391c':
  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:55 +00:00
RoboErik
35e41c1282 am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev 
* commit 'e8a758713344de3c1ca74fe97470d49e7b2706ea':
  Possible fix for dead handler in Music button event sending
 2014-09-08 22:57:39 +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
Tsuwei Chen
60874f9e27 am 38000b0f: Merge "Manually merge QC\'s change for SUPL_ES." into lmp-dev 
* commit '38000b0ffd1080e6e8bd9b0607c8916aa9bd0a1b':
  Manually merge QC's change for SUPL_ES.
 2014-09-08 22:28:27 +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
0637aabfb9 am 32e8bc52: Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev 
* commit '32e8bc5241d3e048ebe8c94902e5a2b458740f81':
  Rename methods/variables on PhoneAccount for API cleanup.
 2014-09-08 21:50:54 +00:00
Yorke Lee
63543a2b7d am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev 
* commit 'af99dec488b5eae712253d24ce9f1e85ccfefdeb':
  Replace Calls.FEATURES_NONE with 0 (1/4)
 2014-09-08 21:50:47 +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