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

209384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
bef837dc57 Remove the rest of utils/Vector.h usage 
Change-Id: I90ab2c17ba1903a8241cba7f623b74ed136dd845
 2015-07-30 09:51:57 -07:00
John Reck
272a685f17 Replace most usages of utils/Vector.h 
Change-Id: I540d1b3523244d6c71fc52d6fb30555271c25644
 2015-07-30 09:51:52 -07:00
John Reck
c36df95229 Re-enable -Werror on clang 
Change-Id: I582bd0665752c7a9deb4f9de094d0dd0a50cda6a
 2015-07-29 10:09:36 -07:00
Geoff Mendal
23f1ced75c Merge "Import translations. DO NOT MERGE" 2015-07-29 12:48:27 +00:00
Geoff Mendal
5694f4f2eb Merge "Import translations. DO NOT MERGE" 2015-07-29 12:46:31 +00:00
Geoff Mendal
aa1fe922e4 Import translations. DO NOT MERGE 
Change-Id: I1d3212e4c99f548da9902c797d5893051bdb4ad8
Auto-generated-cl: translation import
 2015-07-29 05:46:09 -07:00
Geoff Mendal
c5b97f38e4 Import translations. DO NOT MERGE 
Change-Id: I6fb425e4c8c6087dac52c32bf9d6d8d72a8831fd
Auto-generated-cl: translation import
 2015-07-29 05:45:24 -07:00
Geoff Mendal
9a4c03932e Merge "Import translations. DO NOT MERGE" 2015-07-29 12:33:18 +00:00
Geoff Mendal
b851c2102b Import translations. DO NOT MERGE 
Change-Id: I074e138929dbd329a281adbf55521e0d4a521485
Auto-generated-cl: translation import
 2015-07-29 05:32:05 -07:00
Geoff Mendal
9693071036 Merge "Import translations. DO NOT MERGE" 2015-07-29 12:30:55 +00:00
Geoff Mendal
39f43b1dd0 Import translations. DO NOT MERGE 
Change-Id: I3488d6592ecd3293de7a4a755155ce53ded17459
Auto-generated-cl: translation import
 2015-07-29 05:29:05 -07:00
Geoff Mendal
f1dcbc9823 Import translations. DO NOT MERGE 
Change-Id: If6b0135a10eaea48ab3e0343304b464d9569cd59
Auto-generated-cl: translation import
 2015-07-29 05:13:45 -07:00
Narayan Kamath
fed06b130d am 7cd90763: am 4aac30fa: am 8fcb5697: am ff01fcec: am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev 
* commit '7cd90763d136dd6d72107f5ec8ca3baa04980dba':
  Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
 2015-07-29 11:30:49 +00:00
Martijn Coenen
c9e15f6efe am 54d7c4c8: am 619b37a3: am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit '54d7c4c85ae41893d9048e9e10d33b6826d0e04f':
  Resource for setting default NFC payment component.
 2015-07-29 11:08:33 +00:00
Narayan Kamath
7cd90763d1 am 4aac30fa: am 8fcb5697: am ff01fcec: am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev 
* commit '4aac30faf253047fb68358ae6acb7a76e7023c81':
  Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
 2015-07-29 11:06:40 +00:00
Narayan Kamath
4aac30faf2 am 8fcb5697: am ff01fcec: am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev 
* commit '8fcb5697edd99e5c9c3c8e5a7c24071726a3aebe':
  Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
 2015-07-29 10:47:30 +00:00
Martijn Coenen
54d7c4c85a am 619b37a3: am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit '619b37a3616647e7ea32401b772ce65a8aff5e5a':
  Resource for setting default NFC payment component.
 2015-07-29 10:46:48 +00:00
Narayan Kamath
8fcb5697ed am ff01fcec: am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev 
* commit 'ff01fcecf5843104ba5ce835d70aae2ae8483616':
  Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
 2015-07-29 10:31:43 +00:00
Martijn Coenen
619b37a361 am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit 'ef3614ebb9089936ba32772f89c14466d77ba777':
  Resource for setting default NFC payment component.
 2015-07-29 10:27:41 +00:00
Daichi Hirono
09109567e9 Add test for queryRoots. 
BUG=20274999

Change-Id: Iea9ca7514d29bb9dcb9c1ef83ff5554f5dc41901
 2015-07-29 19:27:22 +09:00
Narayan Kamath
ff01fcecf5 am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev 
* commit '7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6':
  Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
 2015-07-29 10:08:04 +00:00
Martijn Coenen
ef3614ebb9 am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit 'c16fd06ae462f79d3f13eb5e29db3227c0e64985':
  Resource for setting default NFC payment component.
 2015-07-29 10:06:14 +00:00
Narayan Kamath
7157c2ca81 Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev 2015-07-29 09:41:22 +00:00
Narayan Kamath
8d1e344f40 Revert "Call getInstanceForPackage instead of creating a new SensorManager instance." 
This reverts commit 5967ddbf05f146bdb6744207e3daed1aa76fc637.

Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
 2015-07-29 09:35:46 +00:00
Martijn Coenen
c16fd06ae4 am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit '50184147fc35d5d441ae24661531819cc6cc025f':
  Resource for setting default NFC payment component.
 2015-07-29 08:10:18 +00:00
Martijn Coenen
50184147fc Merge "Resource for setting default NFC payment component." into mnc-dev 2015-07-29 07:54:29 +00:00
Daichi Hirono
5460441ce4 Merge "Implement queryRoot method of MtpDocumentsProvider." 2015-07-29 06:12:11 +00:00
Shawn Willden
c3c8a67ddf am 35d909c0: am 3f74023e: am 5b065655: am 48b13a58: am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev 
* commit '35d909c0d4e9ccfa3eefb5ca1f907c048513bacf':
  Keymaster digest/padding NONE no longer means ANY.
 2015-07-29 05:40:01 +00:00
Daichi Hirono
50d17aa871 Implement queryRoot method of MtpDocumentsProvider. 
BUG=20274999

Change-Id: I27aa8bffe47eab6ea1f4195023dbacb6e2f76548
 2015-07-29 14:38:11 +09:00
Shawn Willden
35d909c0d4 am 3f74023e: am 5b065655: am 48b13a58: am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev 
* commit '3f74023e028934c5a8d189c17f37009b95518374':
  Keymaster digest/padding NONE no longer means ANY.
 2015-07-29 05:20:13 +00:00
Shawn Willden
3f74023e02 am 5b065655: am 48b13a58: am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev 
* commit '5b0656556a085cbf4e7f17f4dfa8863a022f8e11':
  Keymaster digest/padding NONE no longer means ANY.
 2015-07-29 05:02:18 +00:00
Shawn Willden
5b0656556a am 48b13a58: am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev 
* commit '48b13a58bba59c548d835a2d646e1da6fad6473d':
  Keymaster digest/padding NONE no longer means ANY.
 2015-07-29 04:39:54 +00:00
Shawn Willden
48b13a58bb am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev 
* commit 'a7b4d6dc1017bcb2e6144fa5eb9d2ed07093ffa8':
  Keymaster digest/padding NONE no longer means ANY.
 2015-07-29 04:17:51 +00:00
Shawn Willden
a7b4d6dc10 Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev 2015-07-29 03:58:39 +00:00
Jeff Sharkey
4b76c496c6 am 7412dfe9: am 3f6c3849: am 170235a3: am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit '7412dfe98daaf76377fc5d08e8b9bf994455b2a3':
  Give secondary users read-only physical cards.
 2015-07-29 03:41:19 +00:00
Jeff Sharkey
7412dfe98d am 3f6c3849: am 170235a3: am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit '3f6c3849e96692da51c0e8cb22cce92b6ed9b60b':
  Give secondary users read-only physical cards.
 2015-07-29 03:20:52 +00:00
Ronghua Wu
e33b7d5a95 am 7c86f4df: am cdd81636: am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev 
* commit '7c86f4df7117df592ec595138af39cffb8ae688d':
  media: fix estimateFrameRatesFor to use correct ratio
 2015-07-29 02:31:36 +00:00
Dianne Hackborn
b980bff0cb am f99b8dc4: am a720d91e: am 077ec5c2: am b7eb3901: am b310c894: Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev 
* commit 'f99b8dc484f7d1b1bc3610833ee909e89fbd9d6c':
  Fix issue #22802691: APR: NPE in ActivityRecord
 2015-07-29 02:31:28 +00:00
Dianne Hackborn
ed267cc75b am ad7923f1: am 5d4a5ccb: am 94d5e6b0: am 779ccbe3: am 5b009d52: Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev 
* commit 'ad7923f1403f7fcfec6b0a4c6bbdfcbd686cff37':
  Fix issue #22802617: APR: spurious wtf when restarting a persistent process
 2015-07-29 02:31:21 +00:00
Dianne Hackborn
bfdaab5fda am 578d21fd: am e319841d: am 05e4e78d: am 1b391d64: am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 
* commit '578d21fddc2e15441d3404e6ee5c5813d95165d6':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
 2015-07-29 02:31:14 +00:00
Jeff Sharkey
3f6c3849e9 am 170235a3: am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit '170235a3687e68a960da6a8254f9746c261abffc':
  Give secondary users read-only physical cards.
 2015-07-29 02:18:39 +00:00
Ronghua Wu
7c86f4df71 am cdd81636: am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev 
* commit 'cdd81636e1938e7c9053648a13e6ccebd2ba9d2f':
  media: fix estimateFrameRatesFor to use correct ratio
 2015-07-29 02:12:38 +00:00
Dianne Hackborn
f99b8dc484 am a720d91e: am 077ec5c2: am b7eb3901: am b310c894: Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev 
* commit 'a720d91e5a9241510cfeaa5de0c894ddfb154a65':
  Fix issue #22802691: APR: NPE in ActivityRecord
 2015-07-29 02:12:31 +00:00
Dianne Hackborn
ad7923f140 am 5d4a5ccb: am 94d5e6b0: am 779ccbe3: am 5b009d52: Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev 
* commit '5d4a5ccbadb8d17a900297aa9e766824a0a0397c':
  Fix issue #22802617: APR: spurious wtf when restarting a persistent process
 2015-07-29 02:12:24 +00:00
Dianne Hackborn
578d21fddc am e319841d: am 05e4e78d: am 1b391d64: am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 
* commit 'e319841da95a22152bfc4c519a2ab99478b7f68c':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
 2015-07-29 02:12:17 +00:00
Adam Lesinski
7ca82d915e am 2a098fe9: am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 
* commit '2a098fe90ab0e60c2326e9aedbfdd85529de782f':
  BatteryStats: Use proper power calculator when energy data is received
 2015-07-29 02:10:51 +00:00
Jason Monk
810796ca6a am 3bc1702c: am da808d29: am 3623f314: am ea0ad979: am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev 
* commit '3bc1702c1a789fd490e815916ce6b2df43b7002b':
  Add sizes to SysUI tests
 2015-07-29 02:10:43 +00:00
Aravind Akella
920b1ee76d am 79d0d7c1: am 25931a50: am 33aeb1fe: am 822456eb: am 15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev 
* commit '79d0d7c13df7662d92e8d536d8d3a77e9b4a5f46':
  Call getInstanceForPackage instead of creating a new SensorManager instance.
 2015-07-29 02:10:35 +00:00
Jeff Sharkey
170235a368 am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit 'acfaa947f45ce1ea8140c2dc52d5f750dbc0a94d':
  Give secondary users read-only physical cards.
 2015-07-29 02:01:13 +00:00
Ronghua Wu
cdd81636e1 am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev 
* commit '29bac774ccba0d696857a058f5a1fae7d5c99ba5':
  media: fix estimateFrameRatesFor to use correct ratio
 2015-07-29 01:47:43 +00:00