Dianne Hackborn
84ba83bb3d
am af6eb301: am e882cea6: Merge "Fix issue #17082301 : replacePreferredActivity is ignoring userId" into lmp-dev
...
* commit 'af6eb301c54d90e534ed058c88f6ca7e907eb340':
Fix issue #17082301 : replacePreferredActivity is ignoring userId
2014-08-18 19:17:47 +00:00
Adrian Roos
48986869c3
am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires
...
* commit '2ff048ff5587e029e83e17fdfdecaa3fa0fd70c2':
Play "device trusted" sound when onTrustInitiatedByUser fires
2014-08-18 17:14:52 +00:00
Adrian Roos
49e057d7ee
Play "device trusted" sound when onTrustInitiatedByUser fires
...
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
2014-08-18 16:53:27 +00:00
John Reck
30bb86629a
am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev
...
* commit '98270e20063bd6446c088335c957bb5062ba5cf1':
Don't mangle layer paint's alpha
2014-08-18 16:21:34 +00:00
Jason Monk
d6ea61cd15
am 75391416: am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev
...
* commit '75391416fe284946f41cfa39799f7e580975fbbf':
Fixes to lock task API from API review
2014-08-18 13:51:09 +00:00
Jinsuk Kim
b347ed75cd
am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
...
* commit 'c68c9dbdd5b1e70a429ff2283348a5609522d8cb':
CEC: Replace the usage of logical address with id for HdmiDeviceInfo
2014-08-18 02:37:42 +00:00
Jason Monk
95d9ad0f79
Merge "Fixes to lock task API from API review" into lmp-dev
2014-08-16 04:32:18 +00:00
Jinsuk Kim
98f4c16a7b
Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
2014-08-16 04:12:14 +00:00
John Reck
fb5899d6e0
Don't mangle layer paint's alpha
...
Bug: 15918037
Change-Id: Iecca0908c6e3b77f15807f75a8294d34975533b4
2014-08-18 08:53:36 -07:00
Dianne Hackborn
57137289a2
Merge "Fix issue #17082301 : replacePreferredActivity is ignoring userId" into lmp-dev
2014-08-16 03:56:00 +00:00
Dianne Hackborn
f2ac276127
Fix issue #17082301 : replacePreferredActivity is ignoring userId
...
It was being given the argument and just... ignoring it.
But the bulk of this change is to make replacePreferredActivity
better about replacing -- it now detects if the request will not
make a change and, in that case, just do nothing.
The reason for this?
It turns out that each time you install an app, the telephony
system is calling this function over 20 times to set the default
SMS app. This is almost always doing nothing, but before this
change it means we would re-write packages.xml over 20 times...!
There are definitely more improvements that can be made here (delaying
write of packages.xml to allow them to batch together, reducing
the amount of calls being made), but until then this is a big
improvement.
Change-Id: I02c4235b8ecd5c13ef53e65d13c7dc2223719cec
2014-08-16 19:34:13 -07:00
Robert Greenwalt
bbca13351a
am 316c9421: am c993be52: Add tcp buffer size conduit to NetworkAgent.
...
* commit '316c9421eda732bd510631acd9384b593f37f027':
Add tcp buffer size conduit to NetworkAgent.
2014-08-17 23:22:32 +00:00
Robert Greenwalt
3f05bf4d78
Add tcp buffer size conduit to NetworkAgent.
...
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
2014-08-17 15:14:29 -07:00
Dianne Hackborn
28bb0b8ff3
am 7da20cdf: am 83249fc9: Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev
...
* commit '7da20cdf3c36162ab02790dc99a8c7592e86a015':
Make sure we initialize to enable the default voice interaction service.
2014-08-16 19:09:39 +00:00
Dianne Hackborn
90f58b4447
Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev
2014-08-16 04:29:45 +00:00
Santos Cordon
4adf4b0882
am ef80aab4: am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev
...
* commit 'ef80aab4cd9042171bdd14f2afb89de72d96db06':
Fixing wrong tag usage
2014-08-16 03:56:27 +00:00
Alan Viverette
7544bb43f0
am 95495581: am 4c200997: Merge "Fix date and time picker styling" into lmp-dev
...
* commit '954955811273138b9262f8a1e2ae6df78bdf77e0':
Fix date and time picker styling
2014-08-16 03:14:24 +00:00
Jeff Brown
ae330728bf
am dbab7079: am 23c7b927: Add trace tag for power management.
...
* commit 'dbab7079dc0cde1026c39149f8240260ce09df8a':
Add trace tag for power management.
2014-08-16 03:14:14 +00:00
Alan Viverette
e40b205ef4
am 3adb9051: am 47eba14f: Merge "Better handling of unresolved theme attributes" into lmp-dev
...
* commit '3adb9051a29c904f3a09d82b74c41d16cfa84ca3':
Better handling of unresolved theme attributes
2014-08-16 03:13:06 +00:00
Alan Viverette
5502a547eb
am 1125e88d: am 04ce8195: Merge "Scrapping the view at position zero is still position zero" into lmp-dev
...
* commit '1125e88d3955f900242754691238995b45d00027':
Scrapping the view at position zero is still position zero
2014-08-16 03:12:58 +00:00
Dianne Hackborn
16ec0808b5
Make sure we initialize to enable the default voice interaction service.
...
We weren't taking care of the case of an upgrade to L. The main
change here is that the voice interaction service setting now has
an empty string when the user has explicitly said they don't want
one, so when it is null we will initialize it to its default.
Change-Id: Icdd30b4f09498f8928cea759a64628bd43bc5d0e
2014-08-15 18:34:10 -07:00
Jeff Brown
3edf5272fb
Add trace tag for power management.
...
Instrumented the basic power manager state transitions,
calling into the Power HAL, setting the display power mode,
and setting the backlight.
Bug: 17004602
Change-Id: I4e362162ddfd7292a7eea8b5d029ce3f6593c4a9
2014-08-16 01:21:41 +00:00
Ruben Brunk
384681f18b
am 8d392ff3: am f1aea7f9: Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev
...
* commit '8d392ff3b6430b144c7b3d94aed5f0c0154c7440':
camera2: Add jpeg metadata for LEGACY shim.
2014-08-16 00:22:01 +00:00
Ruben Brunk
ffd87c21ab
am 8b90513e: am b62eea57: camera2: Fix shim aspect ratio scaling.
...
* commit '8b90513e20c7e99731e5e8c05b8705ba8c18b3b4':
camera2: Fix shim aspect ratio scaling.
2014-08-16 00:21:56 +00:00
Ruben Brunk
a9bc355910
camera2: Fix shim aspect ratio scaling.
...
Bug: 16494207
Change-Id: I4bd40dee1caaf8c83a0853d48d44cc97151f9b41
2014-08-15 23:51:52 +00:00
Adam Lesinski
ec620de00c
am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev
...
* commit '345efd9a6988601e67d3c0202e433144670b5e62':
Add FeatureGroup to PackageInfo
2014-08-15 23:16:50 +00:00
Jeff Sharkey
690881325f
am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev
...
* commit '61c28588f4b8d748c95791446e1ca0ca6f7df060':
PackageInstaller API refactoring.
2014-08-15 23:16:45 +00:00
Robert Greenwalt
18b08ad2b5
am 26ca16ce: am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev
...
* commit '26ca16ce704d69e36722786586d8e4449dbabe91':
Configure MTU based on network MTU parameter
2014-08-15 22:23:46 +00:00
Jeff Davidson
f206ab9db3
am 8450fe3b: am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev
...
* commit '8450fe3b1ce69a24e373ebca6302739103f1c03b':
Fix default scorer provisioning.
2014-08-15 22:08:11 +00:00
Adam Lesinski
ab9b1f5b2a
am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev
...
* commit '5bcfb6b98261c94a6ff33438e6b29ca71bb3c0eb':
Fix assumption about DynamicRefTable in aapt
2014-08-15 22:07:59 +00:00
Sunny Goyal
a4dd2c336f
am 6ba6c6ce: am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev
...
* commit '6ba6c6cecbfe58295c07d6c793aebbc3d9ea2ec2':
Returning null when preview image is not available for AppWidgetProviderInfo
2014-08-15 21:47:45 +00:00
Christopher Tate
a981cfba7b
am 5e6afbc2: am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev
...
* commit '5e6afbc2c5dafec254601ac3968a8c26219c91be':
Tighten restore-at-install behavior
2014-08-15 21:47:40 +00:00
Alan Viverette
aeda0586f3
Merge "Fix date and time picker styling" into lmp-dev
2014-08-15 21:23:40 +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
Jeff Davidson
cab3eb0c0b
Merge "Fix default scorer provisioning." into lmp-dev
2014-08-15 21:23:40 +00:00
Adam Lesinski
91348eb957
Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev
2014-08-15 21:23:40 +00:00
Christopher Tate
6cbc07b7c0
Merge "Tighten restore-at-install behavior" into lmp-dev
2014-08-15 21:23:40 +00:00
Alan Viverette
518ff0de95
Fix date and time picker styling
...
Removes done buttons from widgets, fixes date picker day selection, fixes
dialog layouts in landscape, updates colors. Adds API on AlertDialog for
setting the view by resource ID, which is necessary to correctly inflate
the view against the dialog's parent view.
BUG: 16941550
BUG: 16852521
BUG: 16878697
BUG: 16838659
BUG: 17047435
Change-Id: I138858ce06cd4abf68a2c3361ec170370236b33b
2014-08-15 14:20:35 -07:00
Amith Yamasani
38992b95e8
am e52fb6f4: am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev
...
* commit 'e52fb6f4df210523946fbc041207438d8264472c':
Copy certain settings to the managed profile
2014-08-15 21:17:26 +00:00
Julia Reynolds
cdf03e4c1c
am 289bbb2d: am 08aeb505: Merge "Apply lockdowns when user restrictions are set." into lmp-dev
...
* commit '289bbb2d827e73893a201f2ecde04f19c86bfc5f':
Apply lockdowns when user restrictions are set.
2014-08-15 21:17:05 +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
Narayan Kamath
b7f70bddf3
am 9b0fe82e: am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev
...
* commit '9b0fe82e88a0e1d7e806f9ca7c5966bc009b00ac':
Fix getPackageInfo for the "android" package in the system server.
2014-08-15 20:58:38 +00:00
Amith Yamasani
d97a0e7281
Merge "Copy certain settings to the managed profile" into lmp-dev
2014-08-15 19:14:43 +00:00
Amith Yamasani
4f7e2e334e
Copy certain settings to the managed profile
...
All reads of those specific settings will go to the primary user.
Inserts to primary also go to managed profiles in order to notify
any observers.
This enables Location settings to be shared by both profiles.
Also some other settings related to IME and Accessibility since
those services are shared across the profiles.
Bug: 16457210
Change-Id: Ib8fd697b5c78027fcbaf245d82dda5e6d6aab4f0
2014-08-15 13:42:21 -07:00
Robert Greenwalt
bd431ee5d3
Merge "Configure MTU based on network MTU parameter" into lmp-dev
2014-08-15 19:10:34 +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