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

154388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
7cc1a3927d am 5ef20e85: 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 '5ef20e85f4c6878d507fd4c1a89e3efb80446ef6':
  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:23:14 +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
David Friedman
993fbe1e05 am cb39e887: 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 'cb39e8873103bf6c8c268f75357c6b59f364774e':
  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:03 +00:00
David Friedman
18e721f1ca am 24214d37: 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 '24214d378198c1d5cc486f8c8d4e3188fee126c4':
  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:08:58 +00:00
RoboErik
1bfa0f24d5 am c1ec88a5: am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev 
* commit 'c1ec88a508ac65f27c83ecf3fd4ab9bb4c19a8b1':
  Possible fix for dead handler in Music button event sending
 2014-09-08 23:08:53 +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
Tsuwei Chen
c4c7c9d5f2 am 62645748: am 38000b0f: Merge "Manually merge QC\'s change for SUPL_ES." into lmp-dev 
* commit '626457486cbf5e40c77019f965755ae30b72af22':
  Manually merge QC's change for SUPL_ES.
 2014-09-08 22:48:30 +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
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
Andrew Lee
f8cc0fdcb0 am 76abca06: am 32e8bc52: Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev 
* commit '76abca06ab13e3aaf995fbacc919254efbc2cc31':
  Rename methods/variables on PhoneAccount for API cleanup.
 2014-09-08 22:03:18 +00:00
Yorke Lee
b8bf1691cc am 37a32c03: am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev 
* commit '37a32c038db23533ab1bcc0b14fa48ed61e74a60':
  Replace Calls.FEATURES_NONE with 0 (1/4)
 2014-09-08 22:03:12 +00: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
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
9360609a5c am a68d6e31: am ea3bd1ac: Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev 
* commit 'a68d6e319faf12b304194b85d329b71045385482':
  NoMan: Fix speedbump with multiple package priorities
 2014-09-08 21:40:02 +00:00
Tom Taylor
e14fac0b90 am 85e674f6: am 15854740: Merge "DO NOT MERGE - Hide new SmsManager API\'s dealing with SubId" into lmp-dev 
* commit '85e674f6bea8bbeb891d2f09985c0722d516f4db':
  DO NOT MERGE - Hide new SmsManager API's dealing with SubId
 2014-09-08 21:39:57 +00:00
Christoph Studer
29740c89ed am ea3bd1ac: Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev 
* commit 'ea3bd1aca9bed0d06b4f164746710c3ea7c5dd43':
  NoMan: Fix speedbump with multiple package priorities
 2014-09-08 21:34:00 +00:00
Tom Taylor
c28eeb8765 am 15854740: Merge "DO NOT MERGE - Hide new SmsManager API\'s dealing with SubId" into lmp-dev 
* commit '15854740933385d2560f97ce603afa8549e422b4':
  DO NOT MERGE - Hide new SmsManager API's dealing with SubId
 2014-09-08 21:27:57 +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
Chris Wren
3c024a5169 am 7e5c6e91: am 9330c3e5: Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev 
* commit '7e5c6e91b425dce2a4fc98ebdf9ec81ef213825a':
  Bring consistency to FLAG_ONLY_ALERT_ONCE semantics.
 2014-09-08 21:01:01 +00:00
Kenny Guy
bfe9677083 am 61512739: am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev 
* commit '6151273901851d5338989085b23a0eff0ac61aa3':
  Renaming of LauncherApps apis
 2014-09-08 21:00:56 +00:00
John Spurlock
6155cfc52d am 7570a672: am e5feafcd: Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev 
* commit '7570a6725701432e74d4a80f4ad2acb7b1f061e7':
  Zen: Remove suppression of untagged vibrations in zen mode.
 2014-09-08 21:00:51 +00:00
Jorim Jaggi
04cb8bdba0 am 18569879: am 7ad90a9a: Merge "Start all resolver activities after keyguard is gone" into lmp-dev 
* commit '18569879d0e5884d62315f9267c3704b102e1935':
  Start all resolver activities after keyguard is gone
 2014-09-08 21:00:45 +00:00
Chris Wren
ff225d5467 am 9330c3e5: Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev 
* commit '9330c3e544107c0da0425ca5e6cd0caec8d475d7':
  Bring consistency to FLAG_ONLY_ALERT_ONCE semantics.
 2014-09-08 20:50:26 +00:00
Kenny Guy
5bab6dc2bd am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev 
* commit '4e9c9518f937377fab1afd78c09d5d47a1a11ed1':
  Renaming of LauncherApps apis
 2014-09-08 20:50:20 +00:00
John Spurlock
3140b06e29 am e5feafcd: Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev 
* commit 'e5feafcd1589bf6e92669df82a545276fa4ab29b':
  Zen: Remove suppression of untagged vibrations in zen mode.
 2014-09-08 20:50:15 +00:00
Jorim Jaggi
22ebf8890c am 7ad90a9a: Merge "Start all resolver activities after keyguard is gone" into lmp-dev 
* commit '7ad90a9af57d248504b7c33663700db59bebd735':
  Start all resolver activities after keyguard is gone
 2014-09-08 20:50:10 +00: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
Craig Mautner
b1550f7b19 am 0e7b0ba3: am 8ffe407a: Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev 
* commit '0e7b0ba35c3d4341faf438b86570127ec9543bc2':
  Relax requirements on Activity.requestVisibleBehind
 2014-09-08 20:30:48 +00:00