147814 Commits

Author SHA1 Message Date
Brian Carlstrom
261e240c05 Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev 2014-08-15 05:27:16 +00:00
Brian Carlstrom
df6c83fa7b Disable verification based on vold.decrypt. [frameworks/base]
Bug: 15165413
Change-Id: I7aff8e2a2890971fe97769d42121c207dc36aa7c
2014-08-15 09:58:03 -07:00
John Spurlock
4db0d98b42 Zen: Downtime now a condition provider, persist conditions.
- Persist the entire exit condition instead of only the id.
- Make downtime a proper condition provider (similar to the
  existing countdown provider for time-based conditions)
- Move all downtime-related items out of ZenModeHelper and
  into the new condition provider.
- Reevaluate downtime more often, when any of its inputs change.
- Make sure downtime appears as an available condition in the
  condition panel when applicable.

Bug:16296125
Bug:16211189
Bug:17031767
Change-Id: I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
2014-08-15 15:06:15 +00:00
Adrian Roos
65c09b10ca Remove setManagingTrust workaround
Bug: 16622870
Change-Id: Ibdfdd420996081c055d0364f77b65dea6060cb9e
2014-08-15 14:29:55 +00:00
Zoltan Szatmary-Ban
9c7ed91d78 Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 2014-08-15 04:38:54 +00:00
Zoltan Szatmary-Ban
3291de8f6c Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
This reverts commit c9249c69813c6fb889d71d84583c67ae2942e6de.

Change-Id: I5504fddaf7b18efb73cd6c76678b3b39ce9b0229
2014-08-15 14:01:14 +00:00
Zoltan Szatmary-Ban
f8d72cc14f Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
This reverts commit 87efe74e092236c372d3b6909009641123aa416a.

This should be fine now with all the dependency CLs +2-ed


Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
2014-08-15 12:58:37 +00:00
Narayan Kamath
f75aadc028 Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
This reverts commit 19c8ce291e89a9ef1442a20e1feab421b11536d7.

Change-Id: Ie5a5571127311e0a29f314c0566e779cfe940b53
2014-08-15 12:25:52 +00:00
Zoltan Szatmary-Ban
1e7bc0def8 Revert "Revert "Update Trusted Credentials screen in settings""
This reverts commit 0f0de0bdd021bad5f85fdb0399a4ea91a1611e25.

Change-Id: Ia3d0907e3d7c2ec42d64e45f60e3dfaffb932c3d
2014-08-15 12:55:35 +01:00
Adam Lesinski
4b2d0f20db Fix crash in ResStringPool
When a String isn't found in the StringPool,
we should not try to construct a String8 object
from the NULL string.

Bug:15163956
Change-Id: I51e701918b10a72c18a860b8a36dce2afd9c0b82
2014-08-15 06:39:01 +00:00
Calin Juravle
ec92397894 Merge "Integrate NativeActivity with NativeBridge interfaces" into lmp-dev 2014-08-15 04:38:54 +00:00
Yong WU
abd76d0a09 Integrate NativeActivity with NativeBridge interfaces
Bug: 16884833

(cherry picked from commit I73aab8e212860ba5aee9444d801806d3da326a41)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
2014-08-15 13:22:30 +01:00
Selim Cinek
afd7f117b3 Merge "Fixed several bugs with the notification shade" into lmp-dev 2014-08-15 04:32:23 +00:00
Selim Cinek
31094df5c6 Fixed several bugs with the notification shade
Cleaned up the code around mMaxPanelHeight of the
PanelView which could lead to flickering during
peeking.
Changed the panel opening logic to account for lag
when we need to wait for a layout, which could lead
to inconsistent animations.
Fixed a bug where holes could appear in the shade
when notifications were updating.
This also improved the general updating behaviour
which is now done in a nicer animation.

Bug: 15942322
Bug: 15861506
Bug: 15168335
Change-Id: Ifd7ce51bea6b5e39c9b76fd0d766a7d2c42bf7a4
2014-08-15 13:43:47 +02:00
Narayan Kamath
35cbf0e450 Merge "Remove system_server classes from the boot image." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
29564cd245 Remove system_server classes from the boot image.
We set the system_server classpath in the environment
(like we do with BOOTCLASSPATH). After the zygote forks
the system_server, we dexopt the classpath (if needed)
and then launch the system server with the correct
PathClassLoader. This needed several small / medium
refactorings :

- The logic for connecting to installd is now in a separate
  class and belongs in the system_server.
- SystemService / SystemServiceManager have now moved to
  classes.jar. They are only used from there, and since they
  use Class.forName, we want them to be loaded by the
  system_server classloader, and not the bootclassloader.
- BootReceiver now moves to frameworks.jar, because it is
  used by ActivityThread and friends.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
2014-08-15 13:37:03 +01:00
Zoltan Szatmary-Ban
2b13c5641a Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 2014-08-15 04:54:19 +00:00
Narayan Kamath
bdc78678de Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 2014-08-15 04:54:19 +00:00
Narayan Kamath
5dc4a440d1 Merge "Validate instruction sets passed to installd." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
6c4b9de8f1 Validate instruction sets passed to installd.
We don't want folks passing down arbitrary strings.

bug: 16837404
Change-Id: I73ac66b376f1401f9f95f3c6323da6242ac8ed3d
2014-08-15 12:50:10 +01:00
Jeff Sharkey
82d6d337b3 Merge "Some networks may have null ifaces, I guess?" into lmp-dev 2014-08-14 16:46:52 +00:00
Jeff Sharkey
9da2f1e007 Some networks may have null ifaces, I guess?
Seems like a bug further upstream, but guard ourselves against it
for now.

Bug: 17033841
Change-Id: Id0e5895c3389b63d4e34b1fb064efef8b72cd609
2014-08-14 22:42:27 +00:00
Chet Haase
9fde9a250f Merge "ActionBarOverlay needs to be focusable" into lmp-dev 2014-08-14 16:46:52 +00:00
Craig Mautner
a3dabf0ffc Merge "Fix race condition between binder deaths" into lmp-dev 2014-08-14 03:33:54 +00:00
Sailesh Nepal
f4669dffd5 Use thread safe set for RemoteConnection.mListeners
Switch from HashSet to set backed by a ConcurrentHashMap to prevent
ConcurrentModificationExceptions.

(Relanding ag/521178. This got reveretd in ag/520450).

Bug: 16901565
Change-Id: I997898ed94f305d9b8c57eead04e0dfe6c04a884
2014-08-15 01:39:45 +00:00
Sailesh Nepal
8b9d3ca941 Include more state in ParcelableConnection
This fixes a bug where setting status hints wouldn't
work.

Bug: 17044602
Change-Id: Ife85b2d53ead38f54dac350adc09b8c9d052fda4
2014-08-15 01:39:07 +00:00
Craig Mautner
7c9ee19cbd Fix race condition between binder deaths
If a Binder dies there is a race between activity manager and window
manager to see who can handle the binderDied call first. If the
activity manager wins the race it will remove the activity and task
but leave the windows around. Until the WindowState.binderDied call
is made and all animation is complete the windows will try to access
the task that they were associated with.

This fix removes the windows of an activity when the activity is
removed. It also defers removal of the activity and task until
exiting windows have completed their animation.

Fixes bug 17031518.

Change-Id: Idf52f55c5feb0cad4e3664ef2eae5b7e95bbf490
2014-08-14 23:17:15 +00:00
Justin Mattson
d3a73b2545 Merge "Tweak leanback form style" into lmp-dev 2014-08-13 23:16:37 +00:00
Justin Mattson
90c8466216 Tweak leanback form style
Change-Id: I2ecc691b6a0b83590b38cc676674a1d293d18e9e
2014-08-14 16:06:42 -07:00
Adam Lesinski
d7df9d7b38 Merge "Fix aapt dump for APKs with no resources" into lmp-dev 2014-08-14 16:46:52 +00:00
Adam Lesinski
e23a91e2bd Fix aapt dump for APKs with no resources
All APKs are expected to have at least one resource table (even if
it is empty). We were missing the creation of an empty DynamicRefTable.

Bug:16895517
Change-Id: I6a6e887f91b3b4bbcc52b3fd2741ef3d05fab1fd
2014-08-14 21:20:41 +00:00
Lorenzo Colitti
1806b1fc25 Switch RouteInfo to use IpPrefix instead of LinkAddress.
This addresses a TODO and also makes it possible to create
routes to destinations that are not valid LinkAddresses, such as
multicast addresses.

Bug: 16875580
Change-Id: Id4c77b00dc3064bf27d78cdcbbe035e645748cfe
2014-08-13 21:17:20 +09:00
Narayan Kamath
4903f64ba2 Persist the cpuAbiOverride setting.
If an app is installed with an ABI override (adb install -r --abi)
we should remember this so that we don't revert to the scan derived
ABI on the next reboot.

bug: 16476618

Change-Id: I6085bc0099eb613dd9d3b07113c7c13859780697
2014-08-13 12:41:19 +01:00
Jae Seo
e8deca1a0e Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev 2014-08-13 01:30:58 +00:00
Jae Seo
fc27d6db08 TIF: Rename R.attr.contentRatingSystemXml and fix documentation
- Rename contentRatingSystemXml to tvContentRatingDescription.
- Change docs to indicate this is a reference to an XML document that
  describes TV content rating, not a component name.
- Replace the DTD with an XML example.

Bug: 16960702
Change-Id: Iea985e9847ee5af0f745e896c498792234308b12
2014-08-14 17:28:07 +00:00
RoboErik
5ca4a78e32 Merge "Post MediaSessionManager callbacks to the caller's thread" into lmp-dev 2014-08-14 16:46:52 +00:00
RoboErik
b05ea7bb28 Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 2014-08-14 16:10:21 +00:00
RoboErik
e7ba237ce4 Merge "Fix dates on copywrite in new test code" into lmp-dev 2014-08-14 16:10:21 +00:00
Jose Lima
14914858a0 Make TranslucentConversionListener a SystemApi
Change-Id: I59a93e1e040fdbaa9ef108b31e08e4553ba82ae1
2014-08-14 09:15:17 -07:00
RoboErik
24762bffc3 Add an onSessionDestroyed callback to MediaController.Callback
Callbacks on the controller need to know when the session ceases
to exist.

bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
2014-08-13 15:00:21 -07:00
RoboErik
83e3152449 Fix dates on copywrite in new test code
Some of the copywrites in the new browser test code still had 2010
as the year instead of 2014.

Change-Id: I33d19b1ad7f4bbbc8f93d9fb6acc8a92db401807
2014-08-13 13:54:49 -07:00
Torne (Richard Coles)
e0930192be Merge "Store the WebView's package info." into lmp-dev 2014-08-12 23:14:49 +00:00
Jeff Sharkey
e9b78fdbbe Fix javadoc on PROTECTION_FLAG_APPOP.
Change-Id: I36e339ac2c6e6842441fd2572b0b8cda24bd34ca
2014-08-14 16:01:37 +00:00
Torne (Richard Coles)
84392d74fe Store the WebView's package info.
When loading the WebView, save the PackageInfo for the package so that
it can be retrieved later to access the package name, version data, etc.
This will be used to detect WebView downgrades that may affect an app's
saved WebView-related data.

Bug: 16724751
Change-Id: I05ce469308cc87f79c73206327f43b76b1bab222
2014-08-14 16:43:18 +01:00
Sungsoo Lim
dd0b7d083f Merge "Fix hashCode of TvContentRating" into lmp-dev 2014-08-12 23:14:42 +00:00
Narayan Kamath
20200849d1 Fix a couple of PM warnings.
- "Could not delete native binary" : This one is a bit of
  a WTF. git history tells us this code has been around for
  a very long time (the warning's new though). It's a no-op
  because codePath always contains the *current* codePath and
  trying to remove native libs from the current codePath will
  do nothing for bundled apps. This code sounds like it wants
  to delete dangling native binaries for system apps that were
  upgraded during an OTA. This sounds like a wrong place to do
  that, though.

- "Unrecognized code path" : This one's harmless and removed
  by moving this call closer to where it's used.

bug: 16823001

Change-Id: I9b40ae507b2c80ff3fdd45d5699df62bfc86514f
2014-08-13 11:05:58 +00:00
Sungsoo Lim
a9a29a29e5 Fix hashCode of TvContentRating
Bug: 16963556
Change-Id: I0d419e4a47cd4b0a364d3b05063dcdbfc8a168ae
2014-08-13 08:32:29 +00:00
Alexandra Gherghina
7f8821c5a2 Merge "Bugfix: adds extra null check" into lmp-dev 2014-08-12 23:14:48 +00:00
Yohei Yukawa
7360591bbf Suppress warnings of redundant calls of #updateCursorAnchorInfo
Warnings of redundant calls of #updateCursorAnchorInfo should be
suppressed at least until such redundant calls from
android.widget.Editor are addressed.

BUG: 16996008
Change-Id: I62b6acdab06178520473bd53e56e2cfb62fb17be
2014-08-13 17:17:09 +09:00
Ji-Hwan Lee
09015492e5 Merge "TIF: Fix release logic for hardware wrapper input" into lmp-dev 2014-08-12 23:14:48 +00:00