Ihab Awad
78fc9220d4
Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev
2014-08-15 19:10:34 +00:00
Adrian Roos
b7ebbded5f
Fix errors that could lead to brightness flickering
...
Ensures that changing the brightness doesn't lead to
another write to settings from SystemUI. Also makes
sure that a BrightnessDialog from a background user
is never showing. While we're in there, fix the obsolete
window flags as well and ensure BrightnessDialog only ever
allocates one BrightnessController.
Bug: 16297345
Change-Id: Id95b598b0fa99680072bc160afb00d2cd49f05ca
2014-08-15 19:09:09 +00:00
Julia Reynolds
d438deffad
Merge "Apply lockdowns when user restrictions are set." into lmp-dev
2014-08-15 19:03:20 +00:00
Julia Reynolds
3d9eb78fe9
Apply lockdowns when user restrictions are set.
...
Previously DMAgent would apply these lockdowns before/
after setting the matching user restrictions.
Bug: 16701642
Bug: 16945830
Bug: 16944983
Change-Id: Ib4f7145055687f12408d6ccacd8e6380406a32b2
2014-08-15 16:16:38 -04:00
Baligh Uddin
5c7015d764
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-08-15 18:58:28 +00:00
Baligh Uddin
e23e034927
Import translations. DO NOT MERGE
...
Change-Id: If5eb069144f64cf69d3ddcbd88889d1246454569
Auto-generated-cl: translation import
2014-08-15 13:27:39 -07:00
Baligh Uddin
db511f2372
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-08-15 18:58:28 +00:00
Baligh Uddin
402fc0e1e3
Import translations. DO NOT MERGE
...
Change-Id: I94dbc9375f9a15c97f12401af60a6c81e66de121
Auto-generated-cl: translation import
2014-08-15 13:28:46 -07:00
Baligh Uddin
e2541778bf
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-08-15 18:58:28 +00:00
Baligh Uddin
59f7f946e2
Import translations. DO NOT MERGE
...
Change-Id: I6d810b2fcb9d8c57a8295b5ce1c09e12ce8e0184
Auto-generated-cl: translation import
2014-08-15 13:34:28 -07:00
Baligh Uddin
a519df6a42
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-08-15 18:58:28 +00:00
Baligh Uddin
9215c1bc03
Import translations. DO NOT MERGE
...
Change-Id: I7e2a571e43209bd9e7e70d31b3a6f013863f9063
Auto-generated-cl: translation import
2014-08-15 13:36:47 -07:00
Tyler Gunn
a2897ea9d8
Merge "Add BIND_CONNECTION_SERVICE permission." into lmp-dev
2014-08-15 18:56:10 +00:00
Tyler Gunn
0dae9a4cfa
Add BIND_CONNECTION_SERVICE permission.
...
- Added system permission.
- Added enforcement in ConnectionService API class.
Bug: 16171070
Change-Id: Idbd26a31e8f6bb59d3e881a1e5885a44026f2fbd
2014-08-15 15:55:20 -07:00
Alan Viverette
0a992a8288
Merge "Add spinner style for use in forms" into lmp-dev
2014-08-15 18:56:10 +00:00
Tyler Gunn
fa4922960c
Merge "Removing permission check in ConnectionService." into lmp-dev
2014-08-15 18:56:10 +00:00
Tyler Gunn
7d18ceb59f
Removing permission check in ConnectionService.
...
This breaks RemoteConnectionServices, such as hangouts.
Bug: 16171070
Change-Id: I9b53fefe9c3246abb1e9e11109957fb2f8502de8
2014-08-15 17:01:19 -07:00
Adam Lesinski
91306bccf1
Merge "Add FeatureGroup to PackageInfo" into lmp-dev
2014-08-15 18:56:10 +00:00
Adam Lesinski
d3edfde51b
Add FeatureGroup to PackageInfo
...
FeatureGroups replace top-level FeatureInfo objects.
FeatureGroups inherit top-level FeatureInfos but override
them if the feature names are the same.
Bug:16822121
Change-Id: I80b2cb778a0fbcb4521efce986fba641e0914290
2014-08-15 15:53:35 -07:00
Jeff Sharkey
3e3b251f46
Merge "PackageInstaller API refactoring." into lmp-dev
2014-08-15 18:56:10 +00:00
Jeff Sharkey
a0907436c0
PackageInstaller API refactoring.
...
Switch to using IntentSender for results to give installers easier
lifecycle management. Move param and info objects to inner classes.
Bug: 17008440
Change-Id: I944cfc580325ccc07acf22e0c681a5542d6abc43
2014-08-15 15:57:02 -07:00
Baligh Uddin
3f374ac15c
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-08-15 18:51:08 +00:00
Baligh Uddin
3157fd7cac
Import translations. DO NOT MERGE
...
Change-Id: I88f939f51003a025d090c9986b048305e35731ae
Auto-generated-cl: translation import
2014-08-15 13:37:46 -07:00
Justin Mattson
e9695fec7a
Merge "Add fragment animations to setup leanback theme" into lmp-dev
2014-08-15 18:50:14 +00:00
Baligh Uddin
ad6b1426f3
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-08-15 18:48:25 +00:00
Baligh Uddin
f28012ecda
Import translations. DO NOT MERGE
...
Change-Id: I48f1cf9f9f70a4c55824e11179d9aba227dbfa70
Auto-generated-cl: translation import
2014-08-15 12:52:49 -07:00
Baligh Uddin
2f53238fe4
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-08-15 18:48:25 +00:00
Baligh Uddin
d87180a699
Import translations. DO NOT MERGE
...
Change-Id: If3392df7c8c0f86bc7c70a4cbdc452832703732a
Auto-generated-cl: translation import
2014-08-15 12:54:24 -07:00
Ruben Brunk
e364aecf17
Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev
2014-08-15 18:45:09 +00:00
Ruben Brunk
1dc1326eae
camera2: Add jpeg metadata for LEGACY shim.
...
Bug: 15116722
Change-Id: I8abef3ca9a47b2f93978a758aa59c3b915a7e000
2014-08-16 00:03:04 +00:00
Santos Cordon
5e326073e9
Merge "Fixing wrong tag usage" into lmp-dev
2014-08-15 18:45:09 +00:00
Sunny Goyal
0308d9a860
Fixing wrong tag usage
...
Change-Id: I4cb0084a89cc079383d666ad1c5711d96ea81ebe
2014-08-15 17:39:54 -07:00
Sunny Goyal
092e196274
Returning null when preview image is not available for AppWidgetProviderInfo
...
The default application icon generally has a different aspect ratio that a
preview image, and cannot transparently be used in place of the image.
Returning null will allow the apps to handle the case as they see fit.
Change-Id: Ie6e8e16dd7b4e58b222187a81c62d27eccab45a9
2014-08-15 13:02:59 -07:00
Sunny Goyal
336eaae177
Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev
2014-08-15 18:45:09 +00:00
Ruchi Kandoi
cb654362d1
am 1bac45b5: Merge "Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"" into lmp-dev
...
* commit '1bac45b552c7b76298f1376f3eccd103d12f5645':
Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"
2014-08-15 18:42:43 +00:00
Chet Haase
b9b9704bef
am 6954e4f0: Merge "Minor doc fixes from API council recommendations." into lmp-dev
...
* commit '6954e4f0da90e4a0a5c58deed76e2fff2e0aa34b':
Minor doc fixes from API council recommendations.
2014-08-15 18:42:38 +00:00
Erik Pasternak
793c53f626
am b7d0449d: Merge "Add metadata and notifications to OneMedia" into lmp-dev
...
* commit 'b7d0449d34c8f46d7c1d6aa96ef4ae6490da16f6':
Add metadata and notifications to OneMedia
2014-08-15 18:30:28 +00:00
Christopher Tate
a63246d6da
Tighten restore-at-install behavior
...
Harden the guarantee that if we're asked about a possible restore,
we always ALWAYS report back to the package manager. This involved
closing "should never happen" edge cases around provisioning/auto-restore
setting that nevertheless were happening.
Also, on the auto-restore setting front, make sure to plumb that
system API through appropriately, since going behind its back and
manipulating the secure setting directly would cause things to get
out of step.
Bug 17060654
Change-Id: I52ca9c1ffbfc0bd6b57196157500d0868bfc2989
2014-08-15 11:22:01 -07:00
John Spurlock
c9c17734cd
am dcd90bbe: Merge "Zen: tweak audience interruption logic." into lmp-dev
...
* commit 'dcd90bbe69d31fbeaa8929e42077b7128da18c12':
Zen: tweak audience interruption logic.
2014-08-15 18:21:35 +00:00
RoboErik
6d4fd5dc12
am 9ea4316f: Merge "Fix crash in legacy apps that register without a looper" into lmp-dev
...
* commit '9ea4316f4ce8c4bb4a9a1dad8332e300dc475890':
Fix crash in legacy apps that register without a looper
2014-08-15 18:15:06 +00:00
Narayan Kamath
178d65729e
am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev
...
* commit 'f58fd973f4f9f712d9d97b26e6c3afd22145463a':
Fix getPackageInfo for the "android" package in the system server.
2014-08-15 18:04:01 +00:00
Andres Morales
63cec26dd0
am f099ee6a: Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev
...
* commit 'f099ee6ae4cc4f2d66a1c31f4cd2a908d0e02082':
Fix issue where unlock handlers are not properly updated
2014-08-15 17:25:11 +00:00
Adam Lesinski
a25222f5dc
am 41cdc4c7: Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev
...
* commit '41cdc4c75c2ea8c67bcb773cd422b405e025fa25':
Revert "Fix aapt dump for APKs with no resources"
2014-08-15 17:25:04 +00:00
Brian Carlstrom
d38905b785
am 7fca8e30: Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev
...
* commit '7fca8e30e91f893a2831e63c1a47a86baf2c56b8':
Disable verification based on vold.decrypt. [frameworks/base]
2014-08-15 17:10:46 +00:00
John Spurlock
2a5c373615
am 0ac3062e: Zen: Downtime now a condition provider, persist conditions.
...
* commit '0ac3062ed9aab98c26e669a91a0c3893a440b734':
Zen: Downtime now a condition provider, persist conditions.
2014-08-15 15:16:19 +00: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
49d9653ee4
am 5a7b75c0: Remove setManagingTrust workaround
...
* commit '5a7b75c0c02f22b97e871f32b21470629e84ce9a':
Remove setManagingTrust workaround
2014-08-15 14:35:38 +00:00
Adrian Roos
65c09b10ca
Remove setManagingTrust workaround
...
Bug: 16622870
Change-Id: Ibdfdd420996081c055d0364f77b65dea6060cb9e
2014-08-15 14:29:55 +00:00
Zoltan Szatmary-Ban
207029f122
am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev
...
* commit '3e941c339229396864196730c4b069cc437c6ad0':
Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
2014-08-15 14:13:49 +00:00
Calin Juravle
2da6da4938
am a3748052: Merge "Integrate NativeActivity with NativeBridge interfaces" into lmp-dev
...
* commit 'a37480520161a7bb0f40320d99a87327aadd95d5':
Integrate NativeActivity with NativeBridge interfaces
2014-08-15 13:16:55 +00:00