Robert Greenwalt
bd431ee5d3
Merge "Configure MTU based on network MTU parameter" into lmp-dev
2014-08-15 19:10:34 +00:00
Jeff Davidson
cab3eb0c0b
Merge "Fix default scorer provisioning." into lmp-dev
2014-08-15 21:23:40 +00:00
Jay Shrauner
a69adf7535
Merge "Prevent ConcurrentModificationExceptions" into lmp-dev
2014-08-15 19:21:54 +00:00
Adam Lesinski
91348eb957
Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev
2014-08-15 21:23:40 +00:00
Adam Lesinski
2cb761e3dd
Fix assumption about DynamicRefTable in aapt
...
Packages without any resources should not expect to have
a DynamicRefTable.
Bug:16895517
Bug:17056720
Change-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a
2014-08-15 14:01:43 -07:00
Jay Shrauner
229e3820dc
Prevent ConcurrentModificationExceptions
...
Use sets backed by ConcurrentHashMaps instead of HashSets, and
CopyOnWriteArrayLists instead of ArrayLists, to prevent concurrent
exceptions if listeners try to remove themselves in callbacks while
iterating over the listeners.
Bug:16325026
Change-Id: I55e081eda6ba19fa466bbf019c648bbdaf833c33
2014-08-15 13:41:53 -07: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
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
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
Alan Viverette
7ca0bb5d4d
Merge "Better handling of unresolved theme attributes" into lmp-dev
2014-08-15 21:23:40 +00:00
Alan Viverette
34a14f967a
Better handling of unresolved theme attributes
...
Also adds a (very obviously wrong) default color to RippleDrawable
Change-Id: I6d29b371f4e59accbebf25eb059b1f372b9184b0
2014-08-15 17:15:39 -07:00
Alan Viverette
6a2f703fed
Merge "Scrapping the view at position zero is still position zero" into lmp-dev
2014-08-15 21:23:40 +00:00
Alan Viverette
4771b55d13
Scrapping the view at position zero is still position zero
...
BUG: 16418789
Change-Id: I8334d6b37efa1f853152ef2cea041db69e41d24e
2014-08-15 18:02:23 -07:00
Alan Viverette
14a0fbf225
Merge "Fix menu styling" into lmp-dev
2014-08-15 21:23:40 +00:00
Alan Viverette
b9e1a7c226
Fix menu styling
...
BUG: 17069607
Change-Id: Ic6b46fc56546f0e472509110d378c2662f6b4583
2014-08-15 17:32:22 -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
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
Lajos Molnar
be5e3359b1
Merge "media: minor fixes for MediaCodecInfo" into lmp-dev
2014-08-15 19:14:43 +00:00
Lajos Molnar
981c344ee7
media: minor fixes for MediaCodecInfo
...
- use equals() for Range singularity checks
- parse max-channel-count properly
- add platform defaults to G711 and GSM audio codecs
- allow xml to override platform limits if format,
profile or level is not supported (but recognized to be
possibly valid) by the platform
- set defaut format fields
Bug: 11990470
Change-Id: I06114e2d10dcc205a8a963605a01e6d4f6ecd0f0
2014-08-15 17:35:30 -07:00
Alan Viverette
cf8f58350b
Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev
2014-08-15 21:23:40 +00: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
Ihab Awad
78fc9220d4
Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev
2014-08-15 19:10:34 +00: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
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
Ruben Brunk
a9bc355910
camera2: Fix shim aspect ratio scaling.
...
Bug: 16494207
Change-Id: I4bd40dee1caaf8c83a0853d48d44cc97151f9b41
2014-08-15 23:51:52 +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
Christopher Tate
6cbc07b7c0
Merge "Tighten restore-at-install behavior" into lmp-dev
2014-08-15 21:23:40 +00:00