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

192520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Jia
e8e88f81fb am 10d66d96: am 60769445: am ea4eb326: Merge "MediaSync: address API review." into mnc-dev 
* commit '10d66d96a7b61deb3b0d2730413867991b22a784':
  MediaSync: address API review.
 2015-05-08 23:55:47 +00:00
Wei Jia
10d66d96a7 am 60769445: am ea4eb326: Merge "MediaSync: address API review." into mnc-dev 
* commit '607694455dac623c53800966ce65bc035eadb4b4':
  MediaSync: address API review.
 2015-05-08 23:42:45 +00:00
Fyodor Kupolov
a39b5ff076 am 8bc22f52: am 85dbc345: am 4f434a04: Merge "Remove restrictions PIN functionality" into mnc-dev 
* commit '8bc22f521872d64af1c61c1d0845ae562cc5cb8f':
  Remove restrictions PIN functionality
 2015-05-08 23:42:34 +00:00
Alex Klyubin
853676dda7 am 5d53ae1b: am 1258ff62: am 58237563: Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-dev 
* commit '5d53ae1bf92414f66e3327675d3d9abac2698cf2':
  Document when encrypted AndroidKeyStore keys are wiped.
 2015-05-08 23:42:29 +00:00
Fyodor Kupolov
8bc22f5218 am 85dbc345: am 4f434a04: Merge "Remove restrictions PIN functionality" into mnc-dev 
* commit '85dbc345dab0085098a719a6fd56ceb82f59efa6':
  Remove restrictions PIN functionality
 2015-05-08 23:33:13 +00:00
Alex Klyubin
5d53ae1bf9 am 1258ff62: am 58237563: Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-dev 
* commit '1258ff624aad261cd35776ccb6797f859444eec9':
  Document when encrypted AndroidKeyStore keys are wiped.
 2015-05-08 23:33:08 +00:00
Wei Jia
607694455d am ea4eb326: Merge "MediaSync: address API review." into mnc-dev 
* commit 'ea4eb326cfc4a8221be5fdab9639d468c632aee2':
  MediaSync: address API review.
 2015-05-08 23:31:34 +00:00
Ronghua Wu
eec8294a14 am b60966e2: am 7a8c38b1: am 69e927c3: Merge "media: merge CodecException\'s getErrorCode and getReason." into mnc-dev 
* commit 'b60966e2c5459ff5fd18edf578e9e371a0d134db':
  media: merge CodecException's getErrorCode and getReason.
 2015-05-08 23:24:47 +00:00
Mark Salyzyn
7c565ec807 am f1e2acc5: am 39a8865a: am 61df07e1: BootReceiver: scrub APANIC 
* commit 'f1e2acc5a1d96b36ad99ee42adef752a38c57fc0':
  BootReceiver: scrub APANIC
 2015-05-08 23:24:42 +00:00
Christopher Tate
1acf526989 am b0df38d4: am 97f5f43c: am f2f37781: am e8334254: am 4f35e169: am 4475e7df: am ea2c4033: Mark persistent apps as such when the ProcessRecord is created 
* commit 'b0df38d4bc176e30bdb67677ecf415245c0090c0':
  Mark persistent apps as such when the ProcessRecord is created
 2015-05-08 23:24:37 +00:00
Mark Salyzyn
7c5b91dd9d am 86d8d73b: am 0720a542: Merge "BootReceiver: scrub APANIC" 
* commit '86d8d73bf2a9dc327f3a996a56ef83de184c2c47':
  BootReceiver: scrub APANIC
 2015-05-08 23:24:31 +00:00
Wei Jia
ea4eb326cf Merge "MediaSync: address API review." into mnc-dev 2015-05-08 23:23:47 +00:00
Fyodor Kupolov
85dbc345da am 4f434a04: Merge "Remove restrictions PIN functionality" into mnc-dev 
* commit '4f434a04708e7a254afe2e0d362f715229dc15d1':
  Remove restrictions PIN functionality
 2015-05-08 23:19:28 +00:00
Alex Klyubin
1258ff624a am 58237563: Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-dev 
* commit '5823756335ec3ecbe024369e24a6b291471cea9a':
  Document when encrypted AndroidKeyStore keys are wiped.
 2015-05-08 23:19:24 +00:00
Ronghua Wu
b60966e2c5 am 7a8c38b1: am 69e927c3: Merge "media: merge CodecException\'s getErrorCode and getReason." into mnc-dev 
* commit '7a8c38b168207d7c4e893548c9f6f0054a3d98ac':
  media: merge CodecException's getErrorCode and getReason.
 2015-05-08 23:15:12 +00:00
Mark Salyzyn
f1e2acc5a1 am 39a8865a: am 61df07e1: BootReceiver: scrub APANIC 
* commit '39a8865ae5780b59eb39f69aa47de95f78bfe2b3':
  BootReceiver: scrub APANIC
 2015-05-08 23:15:07 +00:00
Christopher Tate
b0df38d4bc am 97f5f43c: am f2f37781: am e8334254: am 4f35e169: am 4475e7df: am ea2c4033: Mark persistent apps as such when the ProcessRecord is created 
* commit '97f5f43c3fd231f502f8c67824293e60c131a50f':
  Mark persistent apps as such when the ProcessRecord is created
 2015-05-08 23:15:01 +00:00
Mark Salyzyn
86d8d73bf2 am 0720a542: Merge "BootReceiver: scrub APANIC" 
* commit '0720a542ddfec61046d8dd33727dcbaf5c1ac6f5':
  BootReceiver: scrub APANIC
 2015-05-08 23:12:07 +00:00
Fyodor Kupolov
4f434a0470 Merge "Remove restrictions PIN functionality" into mnc-dev 2015-05-08 23:10:31 +00:00
Alex Klyubin
5823756335 Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-dev 2015-05-08 23:09:16 +00:00
Chih-Hung Hsieh
cbc61432f1 am bb281b55: am af622b1a: Merge "Fix print format error." 
* commit 'bb281b55525a6fc6d1c9c95d93ec0f2cb44cf6af':
  Fix print format error.
 2015-05-08 23:05:47 +00:00
Ronghua Wu
7a8c38b168 am 69e927c3: Merge "media: merge CodecException\'s getErrorCode and getReason." into mnc-dev 
* commit '69e927c3cd8398e484849f7639fd781e106c1045':
  media: merge CodecException's getErrorCode and getReason.
 2015-05-08 23:00:18 +00:00
Mark Salyzyn
39a8865ae5 am 61df07e1: BootReceiver: scrub APANIC 
* commit '61df07e1504bd1731d211f47ed9d40df7522d924':
  BootReceiver: scrub APANIC
 2015-05-08 23:00:13 +00:00
Christopher Tate
97f5f43c3f am f2f37781: am e8334254: am 4f35e169: am 4475e7df: am ea2c4033: Mark persistent apps as such when the ProcessRecord is created 
* commit 'f2f37781701407acfc64098370b6db1ee70613a2':
  Mark persistent apps as such when the ProcessRecord is created
 2015-05-08 23:00:09 +00:00
Alex Klyubin
5418393c58 Document when encrypted AndroidKeyStore keys are wiped. 
This also drops the boolean parameter from
KeyGeneratorSpec.Builder.setEncryptionRequired to match the already
launched KeyPairGeneratorSpec.Builder.setEncryptionRequired.

Bug: 18088752
Change-Id: I91a3e8c77958971b1bda8329319f1a0d8043b669
 2015-05-08 15:56:59 -07:00
Wale Ogunwale
f27fe49bb3 am eae1cdd2: am 6b832a06: am b2fa5f31: Merge "Clean-up component states in AMS when component is disabled" into mnc-dev 
* commit 'eae1cdd27f5764c3eca238936d53e68d7540af47':
  Clean-up component states in AMS when component is disabled
 2015-05-08 22:53:46 +00:00
John Spurlock
d0c4366bf3 am 62599be1: am 1ff8543c: am ce06c940: Merge "Zen QS: Tweak segmented button + introduction styling." into mnc-dev 
* commit '62599be178b861a6667444b67069d256b2a30e02':
  Zen QS: Tweak segmented button + introduction styling.
 2015-05-08 22:53:41 +00:00
John Spurlock
4a86635c6c am d60c7431: am 022ed34c: am 4755cb3e: Merge "Zen: Tweak default automatic rules." into mnc-dev 
* commit 'd60c74312e9091f2378bd582dfd56e4b53cdb8cd':
  Zen: Tweak default automatic rules.
 2015-05-08 22:53:36 +00:00
Ronghua Wu
69e927c3cd Merge "media: merge CodecException's getErrorCode and getReason." into mnc-dev 2015-05-08 22:53:33 +00:00
John Spurlock
35686d9bff am 22b5f2ac: am a7b4cc0d: am d89a6b2a: Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev 
* commit '22b5f2ac11e769315fa47915217fe546e467cab5':
  Zen: Simplify notification policy api, add zenmode api.
 2015-05-08 22:53:29 +00:00
Chih-Hung Hsieh
bb281b5552 am af622b1a: Merge "Fix print format error." 
* commit 'af622b1a98f7d6a36cf858a6018fdf2daaf09034':
  Fix print format error.
 2015-05-08 22:52:55 +00:00
Mark Salyzyn
61df07e150 BootReceiver: scrub APANIC 
(Cherry pick from commit b49dd577f421adbc4e2c7aa7aa88174905b76242)

Bug: 19525200
Change-Id: I940e25a6dd20d53d44ad8848f490ac18c5e971e9
 2015-05-08 15:48:38 -07:00
Mike Lockwood
cbf3bde01a am cc2d7c93: am a5b42c07: am 5759a8a9: Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into mnc-dev 
* commit 'cc2d7c937c1f8cf8776286888086dc5c7a07e05b':
  BluetoothMidiDevice: Cleanup and error handling improvements
 2015-05-08 22:48:35 +00:00
Mark Salyzyn
0720a542dd Merge "BootReceiver: scrub APANIC" 2015-05-08 22:47:05 +00:00
Wale Ogunwale
eae1cdd27f am 6b832a06: am b2fa5f31: Merge "Clean-up component states in AMS when component is disabled" into mnc-dev 
* commit '6b832a062947680e15fcef9b74af2c9f3b4c4d5e':
  Clean-up component states in AMS when component is disabled
 2015-05-08 22:46:48 +00:00
John Spurlock
62599be178 am 1ff8543c: am ce06c940: Merge "Zen QS: Tweak segmented button + introduction styling." into mnc-dev 
* commit '1ff8543ca4486edec92aa73aaa80dbe4f0c8621b':
  Zen QS: Tweak segmented button + introduction styling.
 2015-05-08 22:46:42 +00:00
John Spurlock
d60c74312e am 022ed34c: am 4755cb3e: Merge "Zen: Tweak default automatic rules." into mnc-dev 
* commit '022ed34cd6af9a23b31cc8854f004a5c1c74b23c':
  Zen: Tweak default automatic rules.
 2015-05-08 22:46:38 +00:00
John Spurlock
22b5f2ac11 am a7b4cc0d: am d89a6b2a: Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev 
* commit 'a7b4cc0dd4e8186533ae5880f72ee7d0238df7ca':
  Zen: Simplify notification policy api, add zenmode api.
 2015-05-08 22:46:33 +00:00
Christopher Tate
f2f3778170 am e8334254: am 4f35e169: am 4475e7df: am ea2c4033: Mark persistent apps as such when the ProcessRecord is created 
* commit 'e83342540b2b7dc7571c12768007697685a6add5':
  Mark persistent apps as such when the ProcessRecord is created
 2015-05-08 22:46:13 +00:00
Mike Lockwood
cc2d7c937c am a5b42c07: am 5759a8a9: Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into mnc-dev 
* commit 'a5b42c07a23cd31d7d57d3dae951968820b48868':
  BluetoothMidiDevice: Cleanup and error handling improvements
 2015-05-08 22:41:51 +00:00
Wale Ogunwale
6b832a0629 am b2fa5f31: Merge "Clean-up component states in AMS when component is disabled" into mnc-dev 
* commit 'b2fa5f3160cfc9b1703c6970649a926370971ea9':
  Clean-up component states in AMS when component is disabled
 2015-05-08 22:39:52 +00:00
John Spurlock
1ff8543ca4 am ce06c940: Merge "Zen QS: Tweak segmented button + introduction styling." into mnc-dev 
* commit 'ce06c940ed04d804574bd0afa3cb7ee6123af39a':
  Zen QS: Tweak segmented button + introduction styling.
 2015-05-08 22:39:48 +00:00
John Spurlock
022ed34cd6 am 4755cb3e: Merge "Zen: Tweak default automatic rules." into mnc-dev 
* commit '4755cb3e5d8012b5554369d0df25ba8634267aa2':
  Zen: Tweak default automatic rules.
 2015-05-08 22:39:43 +00:00
John Spurlock
a7b4cc0dd4 am d89a6b2a: Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev 
* commit 'd89a6b2abc38907a532da7dec073663da5a74e7c':
  Zen: Simplify notification policy api, add zenmode api.
 2015-05-08 22:39:39 +00:00
Wale Ogunwale
b2fa5f3160 Merge "Clean-up component states in AMS when component is disabled" into mnc-dev 2015-05-08 22:34:30 +00:00
Christopher Tate
e83342540b am 4f35e169: am 4475e7df: am ea2c4033: Mark persistent apps as such when the ProcessRecord is created 
* commit '4f35e1699a4b62bd71bed27fece85e2c026210d1':
  Mark persistent apps as such when the ProcessRecord is created
 2015-05-08 22:32:18 +00:00
Ronghua Wu
c53ad69bcc media: merge CodecException's getErrorCode and getReason. 
And unhide getErrorCode.

Bug: 20950388
Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
 2015-05-08 15:31:15 -07:00
Craig Lafayette
f9c256e7d7 am 211a6d93: am 98950e44: am ed1ef7d4: Merge "DeviceInitializerStatus API review changes" into mnc-dev 
* commit '211a6d93f027050239e9937cbc463877fce2e016':
  DeviceInitializerStatus API review changes
 2015-05-08 22:30:14 +00:00
Alex Klyubin
c03cc80440 am 2bf96265: am 57d2a658: am e239f782: Merge "More Javadocs for AndroidKeyStore public classes." into mnc-dev 
* commit '2bf96265d8ab0d68dba48029d2c5f9fd4ae5cf40':
  More Javadocs for AndroidKeyStore public classes.
 2015-05-08 22:30:09 +00:00
Chad Brubaker
54aa83d3e9 am dcf8c5eb: am 47814acc: am f8a96d16: Merge "Cleanup keystore password changing and unlocking" into mnc-dev 
* commit 'dcf8c5eb6c479b7d29f98bd8401b7183e65b7a13':
  Cleanup keystore password changing and unlocking
 2015-05-08 22:30:04 +00:00