176161 Commits

Author SHA1 Message Date
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
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
Alex Klyubin
baf2838fd2 Symmetric key import for AndroidKeyStore.
AES and HmacSHA256 symmetric keys can now be imported into
AndroidKeyStore. These keys cannot yet be used.

Bug: 18088752
Change-Id: Iad2fd49d15ac4c2d676abe1153f5b5f0b6ff496c
2015-03-26 15:37:15 -07:00
Jason Sams
b04f9944fb am 22580b83: Merge "Fix potential npe"
* commit '22580b83f18b572707ea47f99cb9016f067b89f8':
  Fix potential npe
2015-03-26 22:35:04 +00:00
Robert Greenwalt
0a5abe5834 am 727cac07: Merge "Add getLegacyVpnInfoPrivileged method"
* commit '727cac07cc823f4a21be420aa33da6369b390c54':
  Add getLegacyVpnInfoPrivileged method
2015-03-26 22:34:56 +00:00
Jason Sams
73ffe0cc23 Merge "Catch errors for unknown object types." 2015-03-26 22:30:43 +00:00
Jason Sams
bca8e6d35f Catch errors for unknown object types.
bug 19805334

Change-Id: I71e172b8123076896737d352403f8ddefca544b6
2015-03-26 15:29:56 -07:00
Jason Sams
22580b83f1 Merge "Fix potential npe" 2015-03-26 22:10:47 +00:00
Robert Greenwalt
727cac07cc Merge "Add getLegacyVpnInfoPrivileged method" 2015-03-26 22:01:33 +00:00
Jason Sams
ae5be38ebb Fix potential npe
bug 19805515

Change-Id: Id36b145d3ce1c81311e88f5cdd2441880e98f737
2015-03-26 14:47:17 -07:00
Deepanshu Gupta
ec8df9af2f Fix tests for Java 6.
- Change the guava version used to match the one included in the SDK.
   The test server uses the same. However, the command line build still
   uses the guava present at platform/external/guava, which is compiled
   with Java 7. Thus, running the tests from inside the IDE can be done
   via Java 6.
 - Rebuilt the test app classes with Java 6 compatibility.
 - Change similarity threshold to prevent differences due to some locale
   settings different java versions.

Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
2015-03-26 12:29:36 -07:00
Neil Fuller
5a680f2e27 An updater for all timezone data on a device
The existing one, being deleted here, did not work properly: it only
updated the file used by libcore and bionic, it did not update the ICU
data.

Most of the installation logic exists in code in libcore/tzdata that is
independent of the server code so that it can be tested.

Bug: 19941636
Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
2015-03-26 15:16:32 +00:00
Junichi Monma
ce8a9f53b2 Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
bug id : b/19938983

Change-Id: I7568bb9c41b90a57f2e3b89d3fa694ef692f05ac
2015-03-26 22:54:21 +09:00
tiger_huang
293e3586cf Clear the previous states before setting the new app visibility
If setAppVisibility() is called multiple times in a short interval
while the screen is turned off between the calls, the visibility of
the app would be wrong. For example, the user may see the app under
the launcher, not the wallpaper under the launcher.

The flow to the issue:
1. Screen is on.
2. AM calls setAppVisibility() token=App A's token, visible=true
3. Screen is turned off.
4. AM calls setAppVisibility() token=App A's token, visible=false

Note:
a. In 2., WM would put App A into mOpeningApps, and tell it to be
   visible.
b. In 4., because the screen is off now, App A would not be removed
   from mOpeningApps. App A might be told to be invisible directly
   through setTokenVisibilityLocked(), but it would be told to be
   visible again in handleAppTransitionReadyLocked() later.

Change-Id: Icf3d69031ea2822245008248ec8f12bd57218880
2015-03-26 21:10:24 +08:00
louis_chang
40e259c340 [ActivityManager] Fix ServiceRecord leakage
Symptom:
The first step of cleaning up application services is
to clear the app state from services (which set sr.app
to null). Then it clean up the service connections.
In some scenario, the Service might be removed during
the connection cleanup (i.e. the Service is no longer
needed). In that case, the Service will be removed from
ServiceMap, but won't be removed from r.app.services in
bringDownServiceLocked(line 1670) because the r.app is null.

Solution:
Remove the service connection first.

Change-Id: I644d73af58fe0e7c1c4a6c9779fe6b5d747b880d
2015-03-26 13:31:14 +08:00
Michael Runge
9a91bf1d18 am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
* commit '96f47f5bf3f498a7a85721de2e265d8fa3e9af26':
  Increase timeout when uncrypting OTA
2015-03-26 04:08:24 +00:00
Michael Runge
96f47f5bf3 am b0197033: Increase timeout when uncrypting OTA
* commit 'b019703395ae0304ddd10054843c64db87229d23':
  Increase timeout when uncrypting OTA
2015-03-26 03:57:33 +00:00
Michael Runge
b019703395 Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit 01c06dfb076b71cb72c4bff9175bec9d59d2efde)
2015-03-26 03:01:02 +00:00
Jinsuk Kim
bd3deee37b CEC: Explicitly turn on screen for remote control passthrough
Ensures that the playback device turns on display output signal
upon receiving CEC command <User Control Pressed>.

Bug: 19518981
Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5
(cherry picked from commit 9b8507c52ae845c8eed9fd9952bf66538934b8fd)
2015-03-26 02:01:11 +00:00
Filip Gruszczynski
2493d94724 am 9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev
* commit '9001f14b205aba4d9fa236611b122492b92d3b4a':
  Don't use windowOutsetBottom for insets, depend on display padding only.
2015-03-25 22:43:02 +00:00
Filip Gruszczynski
9001f14b20 Merge "Don't use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev 2015-03-25 22:37:38 +00:00
Amith Yamasani
8562a7a110 am eedf2fe0: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit 'eedf2fe04a94c13c4548082a3675c6888293ef4e':
  Fix NPE if FPE service does not exist.
2015-03-25 22:25:51 +00:00
Amith Yamasani
eedf2fe04a 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-25 22:19:20 +00:00