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

176428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
fb37c97c25 am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '61bb0b4f58f794ff468f2cfaf958cb5cc0b09026':
  Fix tests for Java 6.
 2015-03-27 02:58:47 +00:00
Christopher Tate
63862a2052 am 7b73a788: am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
* commit '7b73a788f0c18a31de729daa51e7e06286cf7609':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 02:58:40 +00:00
Deepanshu Gupta
61bb0b4f58 am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '4e6ae02a29dd432648a81f3803f3ccf712621d43':
  Fix tests for Java 6.
 2015-03-27 02:49:27 +00:00
Christopher Tate
7b73a788f0 am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
* commit 'dbe0dd160e93feef1335830a36e86ae83b19b793':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 02:49:23 +00:00
Jason Sams
5f786f0dab am 226fc774: am ee80414d: Merge "Fix doc bug for object size." 
* commit '226fc77468647303a81a05198851c81222e68efc':
  Fix doc bug for object size.
 2015-03-27 01:24:54 +00:00
Michael Runge
34ec4cc7b3 am 7b1237e5: am 0f9b7015: am 9e3976b6: am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '7b1237e52c2553a78b1839017b36718b5f3e6095':
  Increase timeout when uncrypting OTA
 2015-03-27 01:24:48 +00:00
Amith Yamasani
bf67d25be9 am cffe727e: am a5c20b98: am c704bc64: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit 'cffe727eb2f2e559c20a9eed92f96982a53c4625':
 2015-03-27 01:24:45 +00:00
Deepanshu Gupta
ec2a40969c am c55858ff: am fc18e950: am cfdd1e18: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'c55858ffd0039afb49f01ad06ed430bf206aa0d7':
 2015-03-27 01:24:40 +00:00
Deepanshu Gupta
1bf6d5432f am 5935ee2f: am 836f5d98: am 85afc992: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '5935ee2fc9a7f0cfd8be303c8474937aca2ef40c':
 2015-03-27 01:24:37 +00:00
Deepanshu Gupta
218ab6f48d am e91d8d82: am 18755bfa: am 0c8ccefc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e91d8d82ebbc23ac9a067687d8a32a28685a939e':
 2015-03-27 01:24:33 +00:00
Deepanshu Gupta
1a3b4701f7 am 1a715a54: am 7a5a976c: am c07448d2: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '1a715a540f24895fc13bb58dc5c4919d9534f2b1':
 2015-03-27 01:24:29 +00:00
Deepanshu Gupta
703e0aec57 am 1ea4657b: am 02e11a59: am 75614212: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '1ea4657bbb6bc58e573e7b3e791fa659c4bec4fc':
 2015-03-27 01:24:24 +00:00
Deepanshu Gupta
070c3427c2 am 46e61156: am 173e931d: am 5bbc0265: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '46e61156a080152c504f2b9c674e990f19dee8e2':
 2015-03-27 01:24:20 +00:00
Jeff Brown
833ed282e1 am 16869c8e: am a15ce03e: am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit '16869c8e25a7dbafb1c0aed29f2bd8e164fa9b67':
 2015-03-27 01:24:16 +00:00
Jason Sams
226fc77468 am ee80414d: Merge "Fix doc bug for object size." 
* commit 'ee80414d0ddd6a27bbf86e0de47dd86bc335431d':
  Fix doc bug for object size.
 2015-03-27 01:13:26 +00:00
Michael Runge
7b1237e52c am 0f9b7015: am 9e3976b6: am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '0f9b70159a07f09f34c3688cce4b30362afa1855':
  Increase timeout when uncrypting OTA
 2015-03-27 01:10:25 +00:00
Amith Yamasani
cffe727eb2 am a5c20b98: am c704bc64: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit 'a5c20b98cd1c0b18fa3d434f0ecf44cd8db155f4':
 2015-03-27 01:10:17 +00:00
Deepanshu Gupta
c55858ffd0 am fc18e950: am cfdd1e18: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'fc18e950bf5a05ac29e1b070b0bdfd5002903cae':
 2015-03-27 01:10:01 +00:00
Deepanshu Gupta
5935ee2fc9 am 836f5d98: am 85afc992: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '836f5d986f9dc4d6915aade059ef5ff7e584cde1':
 2015-03-27 01:09:56 +00:00
Deepanshu Gupta
4e6ae02a29 am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '17bb697b3bce1b23137553829dd62e0e7c16b472':
  Fix tests for Java 6.
 2015-03-27 01:09:53 +00:00
Deepanshu Gupta
e91d8d82eb am 18755bfa: am 0c8ccefc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit '18755bfa3e346c42212f235e79856de54aae2095':
 2015-03-27 01:09:45 +00:00
Deepanshu Gupta
1a715a540f am 7a5a976c: am c07448d2: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '7a5a976c9e054303ddd19a26c587c5e34368a339':
 2015-03-27 01:09:39 +00:00
Deepanshu Gupta
1ea4657bbb am 02e11a59: am 75614212: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '02e11a595ec064c94ac71336d6197eb3018eece1':
 2015-03-27 01:09:32 +00:00
Deepanshu Gupta
46e61156a0 am 173e931d: am 5bbc0265: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '173e931d4587c2dd1e6777a615a8c388e5df7caf':
 2015-03-27 01:09:27 +00:00
Jeff Brown
16869c8e25 am a15ce03e: am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit 'a15ce03ee716be8b59965e0aeb6e6fcb23a8c237':
 2015-03-27 01:09:22 +00:00
Deepanshu Gupta
17bb697b3b am ec8df9af: Fix tests for Java 6. 
* commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
  Fix tests for Java 6.
 2015-03-27 01:02:58 +00:00
Jason Sams
ee80414d0d Merge "Fix doc bug for object size." 2015-03-27 00:58:46 +00:00
Michael Runge
0f9b70159a am 9e3976b6: am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '9e3976b6feba28b027122af25b21c9eca6705f0f':
  Increase timeout when uncrypting OTA
 2015-03-27 00:50:41 +00:00
Amith Yamasani
a5c20b98cd am c704bc64: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit 'c704bc647270c30b5c38d53d10228325befeb0b7':
 2015-03-27 00:50:33 +00:00
Deepanshu Gupta
fc18e950bf am cfdd1e18: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'cfdd1e18a8039b8c0b1c1f260018cac3a613c3ec':
 2015-03-27 00:50:27 +00:00
Deepanshu Gupta
836f5d986f am 85afc992: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '85afc992ea0058155c73b2ad06f130df7bc697f4':
 2015-03-27 00:50:19 +00:00
Deepanshu Gupta
18755bfa3e am 0c8ccefc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit '0c8ccefc54f4ddb2cc91df093bc09bd4ac8a1215':
 2015-03-27 00:50:00 +00:00
Deepanshu Gupta
7a5a976c9e am c07448d2: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit 'c07448d22ccc802acef341684d182898b6d449b6':
 2015-03-27 00:49:53 +00:00
Deepanshu Gupta
02e11a595e am 75614212: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '75614212d44c6874d5c7af1e7611566979b3471f':
 2015-03-27 00:49:46 +00:00
Deepanshu Gupta
173e931d45 am 5bbc0265: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '5bbc026536f460c90f17f4554bad554f72df0009':
 2015-03-27 00:49:40 +00:00
Jeff Brown
a15ce03ee7 am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit '64646defa7d01ca4105a5da8cc8d0999dac1543d':
 2015-03-27 00:49:33 +00:00
Jason Sams
fb4f5cf614 Fix doc bug for object size. 
Change-Id: I3c810abcb9734196bd8804a22efc010dd3a73291
 2015-03-26 17:39:34 -07:00
Michael Runge
9e3976b6fe am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '9a91bf1d18d3855b4bdaaa613fa10372da6e530e':
  Increase timeout when uncrypting OTA
 2015-03-27 00:35:12 +00:00
Amith Yamasani
c704bc6472 am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit '0afd1905b59446fc471680325bcbea802bb37c5c':
  Fix NPE if FPE service does not exist.
 2015-03-27 00:35:00 +00:00
Deepanshu Gupta
cfdd1e18a8 am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
  Update JRE for runConfigurations.
 2015-03-27 00:34:21 +00:00
Deepanshu Gupta
85afc992ea am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
  Fix project settings. [DO NOT MERGE]
 2015-03-27 00:34:12 +00:00
Deepanshu Gupta
0c8ccefc54 am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
  Fix RoundRect radius.
 2015-03-27 00:34:01 +00:00
Deepanshu Gupta
c07448d22c am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
  Use right colors for status bar and nav bar.
 2015-03-27 00:33:56 +00:00
Deepanshu Gupta
75614212d4 am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
  Better shadows.
 2015-03-27 00:33:52 +00:00
Deepanshu Gupta
5bbc026536 am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.
 2015-03-27 00:33:47 +00:00
Jeff Brown
64646defa7 am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.
 2015-03-27 00:33:21 +00:00
Christopher Tate
dbe0dd160e When scanning unbundled apps, only install the expected APK tree 
We now make sure, when scanning post-factory app installs, that we do not
accidentally activate a "leaked" or otherwise superfluous APK tree that the
scan algorithm happens to encounter before the one that we expect a priori
based on the persisted package-installation state.  When we find such an
extraneous installation we ignore it in favor of the expected one, similarly
to the policy used when collecting system-bundled packages that have been
updated.

Even if we find an unexpected APK for the package, if the expected one
turns out to be absent we fall back to the existing "we thought this app
was present and now it isn't" logic.

Bug 19602471

Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74
 2015-03-26 15:55:30 -07:00
Jason Sams
9b25b77feb am d641bb00: am 73ffe0cc: Merge "Catch errors for unknown object types." 
* commit 'd641bb009912818a1eb68bb46bfaf3af08318ea7':
  Catch errors for unknown object types.
 2015-03-26 22:53:19 +00:00
Jason Sams
d641bb0099 am 73ffe0cc: Merge "Catch errors for unknown object types." 
* commit '73ffe0cc23dd094e720b947b4daefac90e98524b':
  Catch errors for unknown object types.
 2015-03-26 22:45:48 +00:00
Nick Kralevich
ff3ed45537 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 2015-03-26 22:42:08 +00:00