OSDN Git Service
Romain Guy [Wed, 25 Jan 2017 18:23:03 +0000 (10:23 -0800)]
Change configuration's color mode based on the display's color mode
Bug:
32984164
Test: CtsContentTestCases
Change-Id: Iedc7d1cc488b80718576082667b6e96956c4f847
Hangyu Kuang [Wed, 25 Jan 2017 18:07:22 +0000 (18:07 +0000)]
Merge "media: Relax the filedescriptor check to allow write-only mode."
Hongming Jin [Wed, 25 Jan 2017 18:06:28 +0000 (18:06 +0000)]
Merge "Test: AccountManagerService APCT test."
Edman Anjos [Wed, 25 Jan 2017 17:59:59 +0000 (17:59 +0000)]
Merge changes I50d2903e,Ieb347ce3
* changes:
Add DPMS delegation scopes.
Add block uninstall delegation in DPMS.
Hangyu Kuang [Mon, 23 Jan 2017 21:23:17 +0000 (13:23 -0800)]
media: Relax the filedescriptor check to allow write-only mode.
Test: Use the MMS app to record video.
Bug:
34594319
Change-Id: I0680c48f5f240e2b18264dbf952622ad0497130b
TreeHugger Robot [Wed, 25 Jan 2017 17:25:15 +0000 (17:25 +0000)]
Merge "Tron logging - Fix isValidValue to match its name, allow nulls."
TreeHugger Robot [Wed, 25 Jan 2017 17:23:21 +0000 (17:23 +0000)]
Merge "Add support for BLOB format to HardwareBuffer."
Doris Liu [Wed, 25 Jan 2017 17:22:57 +0000 (17:22 +0000)]
Merge "New functionalities for AnimatorSet: Reverse, Seek"
Niels Egberts [Wed, 25 Jan 2017 17:10:51 +0000 (17:10 +0000)]
Merge "Register new TTS settings page for speed and pitch sliders."
Adam Lesinski [Wed, 25 Jan 2017 16:56:48 +0000 (16:56 +0000)]
Merge "Add support for Split APK dependcies"
Daniel Sandler [Wed, 25 Jan 2017 16:45:36 +0000 (16:45 +0000)]
Merge "What color starts with O?"
TreeHugger Robot [Wed, 25 Jan 2017 16:40:33 +0000 (16:40 +0000)]
Merge "use new clipbounds api"
Dan Sandler [Wed, 25 Jan 2017 02:46:31 +0000 (21:46 -0500)]
What color starts with O?
Fixes:
34609358
Test: visual
Change-Id: I00f4559abc30720ee04c09e0d04fa91de67ceeb9
Hint: NOT TEAL
Esteban Talavera [Wed, 25 Jan 2017 16:17:34 +0000 (16:17 +0000)]
Merge "Wipe device or profile if max failed attempt reached"
Andrew Sapperstein [Wed, 25 Jan 2017 16:14:33 +0000 (16:14 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev am:
a60f7151e6
am:
4715e5c6a9
Change-Id: I540802c6207fd80beb8dfe1298d33e0efea3549e
Andrew Sapperstein [Wed, 25 Jan 2017 16:13:39 +0000 (16:13 +0000)]
Decrease frequency of high temp warnings am:
97bfa0f17d
am:
be0f185de9
Change-Id: I8922139364c0b03927141236325b3ce667280dc6
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:47 +0000 (16:08 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
am:
a60f7151e6
Change-Id: I11be13e9f6404cc74fa44cb6a8278a019634ecf1
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:41 +0000 (16:08 +0000)]
Decrease frequency of high temp warnings
am:
97bfa0f17d
Change-Id: I48237148a12cbf8b11df798001aa5c99428a6daa
Julia Reynolds [Wed, 25 Jan 2017 16:03:36 +0000 (16:03 +0000)]
Merge "Allow notifications to be autocanceled at a time."
Andrew Sapperstein [Wed, 25 Jan 2017 16:01:04 +0000 (16:01 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
Alison Cichowlas [Wed, 25 Jan 2017 13:51:45 +0000 (08:51 -0500)]
Tron logging - Fix isValidValue to match its name, allow nulls.
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics/LogMakerTest.java
Change-Id: I92567e1873c5178606ac88135b5934d760b4ec24
Edman Anjos [Fri, 13 Jan 2017 21:26:17 +0000 (22:26 +0100)]
Add DPMS delegation scopes.
Implement the permission grant, package access, enable system app, and
keep uninstalled packages delegation scope APIs in the
DevicePolicyManagerService.
This feature gives a device owner or profile owner the ability to
delegate some of its privileges to another application.
Bug:
33105287,
33105284,
33105719
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegation
Change-Id: I50d2903eb73ae7844ec1f6fe07e41101ea2760ea
Edman Anjos [Mon, 19 Dec 2016 19:25:54 +0000 (11:25 -0800)]
Add block uninstall delegation in DPMS.
Implement the uninstall blocker delegation scope API in
DevicePolicyManagerSercice.
This feature gives a device owner or profile owner the ability to
delegate some of its privileges to another application.
Bug:
33105718
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegation
Change-Id: Ieb347ce3fb6219fe7f04cafbcd1e6b7359b31a10
TreeHugger Robot [Wed, 25 Jan 2017 15:28:27 +0000 (15:28 +0000)]
Merge "Make one method slightly less useful to save others"
Edman Anjos [Wed, 25 Jan 2017 15:19:24 +0000 (15:19 +0000)]
Merge "Refactor DPMS Cert Installer and App Restrictions delegation."
TreeHugger Robot [Wed, 25 Jan 2017 15:01:02 +0000 (15:01 +0000)]
Merge "Fix crash with FontProvider"
Julia Reynolds [Mon, 28 Nov 2016 19:29:25 +0000 (14:29 -0500)]
Allow notifications to be autocanceled at a time.
Test: cts
Change-Id: I24ebcab2c0fa2028ec5d2984dc3b7ec19391b590
Mike Reed [Wed, 25 Jan 2017 13:23:25 +0000 (08:23 -0500)]
use new clipbounds api
Allows us to remove SK_SUPPORT_LEGACY_GETCLIPBOUNDS flag
Change-Id: I7c6665b4eb67c58fe747c07b8b87d58fe9b10120
Seigo Nonaka [Wed, 25 Jan 2017 13:25:10 +0000 (22:25 +0900)]
Fix crash with FontProvider
Need to freeze the FontFamily otherwise the FontFamily is not created.
Test: manually done
Change-Id: I81a6f0d295f13bbeb059deafb4283654f97c0090
Charles He [Wed, 25 Jan 2017 12:48:41 +0000 (12:48 +0000)]
Merge "Fingerprint: check current user or profile properly"
Robin Lee [Wed, 25 Jan 2017 12:47:56 +0000 (12:47 +0000)]
Merge "Lock all profile tasks if keyguard is locked too"
Victor Chang [Wed, 25 Jan 2017 12:13:32 +0000 (12:13 +0000)]
Merge "Send DEVICE_OWNER_CHANGED to manifest receivers in background"
Esteban Talavera [Tue, 24 Jan 2017 16:47:16 +0000 (16:47 +0000)]
Wipe device or profile if max failed attempt reached
If the device or profile owner have set a max password failed
attempts policy, the device or profile should be wiped even if
DISALLOW_FACTORY_RESET / DISALLOW_REMOVE_USER /
DISALLOW_REMOVE_MANAGED_PROFILE was set by that admin. However
it should still fail if another device admin set the policy - this
is in line with what wipeData() does at the moment.
Bug:
34450538
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerPlusManagedProfileTest#testWipeData
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.ManagedProfileTest#testWipeData
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testDisallowFactoryReset
Change-Id: Ifac240692ce74432f7b57f3dfbbbac2a7282297b
Victor Chang [Tue, 24 Jan 2017 15:42:33 +0000 (15:42 +0000)]
Send DEVICE_OWNER_CHANGED to manifest receivers in background
- DEVICE_OWNER_CHANGED is an event that could happen maximum of 2 times
after device factory reset. The event rarely
happens, and it shouldn't affect any system health
Fix:
34446573
Test: adb shell am instrument -w -e class
com.android.server.devicepolicy.DevicePolicyManagerTest
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic1af2016f590e1200bb3e56f63caa0e0b12f71f8
Edman Anjos [Mon, 28 Nov 2016 15:35:15 +0000 (16:35 +0100)]
Refactor DPMS Cert Installer and App Restrictions delegation.
The DevicePolicyManagerService currently supports delegation of
certificate installation and application restriction management, both
of which are individually handled by DPMS.
Upcoming framework features will add four more delegation types,
namely: block uninstall; app permission management; app access
management; and system app enabler. At this moment it makes sense to
refactor the underlying delegation system in DPMS so that current and
future delegates can be handled in a more generic way.
Bug:
33099995
Test: DPMS unit tests
Change-Id: I9e350143572c6690febdd59d1ed5149af8ee4388
Tobias Thierer [Wed, 25 Jan 2017 11:50:30 +0000 (11:50 +0000)]
Merge "API: Update Collections to OpenJDK8u60" am:
815fb54798 am:
b8557c431d am:
6a5fccdc66
am:
db79f383e9
Change-Id: Ie1d8db44913d24f55682465021fe1145be76c5d2
Tobias Thierer [Wed, 25 Jan 2017 11:44:56 +0000 (11:44 +0000)]
Merge "API: Update Collections to OpenJDK8u60" am:
815fb54798 am:
b8557c431d
am:
6a5fccdc66
Change-Id: I2636fb0fc54bbf0958b498494f4d587aa283b7d4
Nicolas Prévot [Wed, 25 Jan 2017 11:42:02 +0000 (11:42 +0000)]
Merge "Allow DO to provision even if it has set disallow remove mp."
Tobias Thierer [Wed, 25 Jan 2017 11:40:33 +0000 (11:40 +0000)]
Merge "API: Update Collections to OpenJDK8u60" am:
815fb54798
am:
b8557c431d
Change-Id: I074661952d4d8b67cdba3038f564d29329469bab
Tobias Thierer [Wed, 25 Jan 2017 11:35:11 +0000 (11:35 +0000)]
Merge "API: Update Collections to OpenJDK8u60"
am:
815fb54798
Change-Id: I97f0155ed743c7bc674f0241b2b07955e8d68e56
Tobias Thierer [Wed, 25 Jan 2017 11:29:42 +0000 (11:29 +0000)]
Merge "API: Update Collections to OpenJDK8u60"
Niels Egberts [Tue, 24 Jan 2017 15:30:28 +0000 (15:30 +0000)]
Register new TTS settings page for speed and pitch sliders.
Test: mmma -j40 frameworks/base
Change-Id: I870fb060ac792cab715ad9c7954962cca2c29e76
Charles He [Wed, 18 Jan 2017 20:03:47 +0000 (20:03 +0000)]
Fingerprint: check current user or profile properly
Fixes a bug that causes isCurrentUserOrProfile to always return true.
Test: none
Bug:
34430969
Change-Id: I2804ac95da0c68a552a436397256e123bc8307e7
Nicolas Prévot [Wed, 25 Jan 2017 10:54:41 +0000 (10:54 +0000)]
Merge "Update DPM unit tests checking isProvisioningAllowed for comp."
Filip Pavlis [Wed, 25 Jan 2017 10:26:17 +0000 (10:26 +0000)]
Merge "Add getParent() on Preference."
Doris Liu [Wed, 18 Jan 2017 01:10:42 +0000 (17:10 -0800)]
New functionalities for AnimatorSet: Reverse, Seek
This CL adds reverse and seek to AnimatorSet's capabilities.
Structural changes:
1) Child animators are now being pulsed by AnimatorSet in a more
timeline manner, as opposed to the old listener based style.
This timeline based approach avoids the time offset in between
sequential animations, and therefore produces a more accurate
overall duration.
2) Timeline is done by representing start and end of each child animator
in two separate events. All the events are then sorted based on the
time they happen, such that it's clear what should happen in between
last frame and the new frame (i.e. which animations should start
or end).
Test: CTS (in the same topic branch)
Bug:
30993532
Change-Id: If1dc6e8dbc93a4bf5ade8c5b0dcf43d3ee6ba7b5
Bartosz Fabianowski [Wed, 25 Jan 2017 08:11:04 +0000 (08:11 +0000)]
Merge "Add device id attestation"
TreeHugger Robot [Wed, 25 Jan 2017 07:05:45 +0000 (07:05 +0000)]
Merge "Follow minikin::FontFamily constructor signature change."
TreeHugger Robot [Wed, 25 Jan 2017 06:33:29 +0000 (06:33 +0000)]
Merge changes from topic 'remove-idmap-adamlesinski'
* changes:
Fix memory leak during idmap creation
installd: add command 'removeIdmap'
Hongming Jin [Wed, 25 Jan 2017 01:30:11 +0000 (17:30 -0800)]
Test: AccountManagerService APCT test.
APCT tests for AccountManagerService for getAccountsByFeatures
Bug:
31346530
Change-Id: I996d667fb72478f635a8afa5b53fb8b4d350b22a
TreeHugger Robot [Wed, 25 Jan 2017 05:41:55 +0000 (05:41 +0000)]
Merge "power HAL uses "default" service name"
TreeHugger Robot [Wed, 25 Jan 2017 05:08:40 +0000 (05:08 +0000)]
Merge changes from topic 'sensor_direct_report'
* changes:
Sensor event direct report mode implementation
Sensor event direct report mode support API
Mårten Kongstad [Thu, 2 Jun 2016 07:34:36 +0000 (09:34 +0200)]
Fix memory leak during idmap creation
Plug a memory leak in AssetManager::createIdmap.
Bug:
31052947
Test: use Valgrind and dummy native app
Change-Id: I83af3a40516ed2d50d5a7c8ee175ed960fde9933
Mårten Kongstad [Thu, 2 Jun 2016 07:35:09 +0000 (09:35 +0200)]
installd: add command 'removeIdmap'
Add an installd command to remove an idmap file. This is the inverse of
the 'idmap' command and is intended for clean-up once an idmap file is
no longer needed because an APK was removed, etc.
This commit depends on a corresponding commit in frameworks/native (with
the same Change-Id).
Bug:
31052947
Test: run tests from 'OMS: tests for OverlayManagerService'
Change-Id: Iae19a519803f0c172b02a32faa283ef36f43863c
Bartosz Fabianowski [Mon, 23 Jan 2017 16:40:47 +0000 (17:40 +0100)]
Add device id attestation
This adds a new public API for attesting the device's hardware ids
(e.g. serial number and IMEI).
Bug:
34597337
Test: CTS CtsKeystoreTestCases and GTS DeviceIdAttestationHostTest
Change-Id: I2e9c1b4f8eb24afa4a09c71c137ce33a6b87eb27
TreeHugger Robot [Wed, 25 Jan 2017 03:41:32 +0000 (03:41 +0000)]
Merge "Add support for carrier demo mode"
Peter Qiu [Wed, 25 Jan 2017 03:30:50 +0000 (03:30 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am:
123aa5d8b1 am:
55d23d0829 am:
c11689de2f
am:
4be45a09f4
Change-Id: I827135881dfbfa46a9566b838c1de2d1f99a0456
TreeHugger Robot [Wed, 25 Jan 2017 03:28:22 +0000 (03:28 +0000)]
Merge "Finish font support for AAPT"
Peter Qiu [Wed, 25 Jan 2017 03:26:19 +0000 (03:26 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am:
123aa5d8b1 am:
55d23d0829
am:
c11689de2f
Change-Id: Icb6bd9db5058b11cc27174acf616a8d751041d1d
Peter Qiu [Wed, 25 Jan 2017 03:21:49 +0000 (03:21 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am:
123aa5d8b1
am:
55d23d0829
Change-Id: Ia7d1beb9a1ebd55a72c403f9ed159f55b491b10b
Peng Xu [Wed, 7 Dec 2016 11:54:44 +0000 (03:54 -0800)]
Sensor event direct report mode implementation
Implementation of sensor direct report API. In this verison, only
ashmem(MemoryFile) backed direct channel is implemented. Support
of HardwareBuffer class will come in a following CL.
Test: tested with demo app
Bug:
30985702
Change-Id: I29cae5cb2615c7a128fe203ed1545c03010ca4aa
Peter Qiu [Wed, 25 Jan 2017 03:17:19 +0000 (03:17 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
am:
123aa5d8b1
Change-Id: If8164839812728361fcd3d9b2f37c481ccf9b33c
Treehugger Robot [Wed, 25 Jan 2017 03:09:08 +0000 (03:09 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
TreeHugger Robot [Wed, 25 Jan 2017 03:01:34 +0000 (03:01 +0000)]
Merge "Implemented network score cache filtering."
Craig Donner [Wed, 25 Jan 2017 02:14:44 +0000 (18:14 -0800)]
Add support for BLOB format to HardwareBuffer.
Test: updated CTS test to check for error conditions if the blob dimensions are
bad.
Bug:
34050596
Change-Id: I3ec6e7a43dae8d0ac2b2d04bc4b38cd3c12f8390
Adam Lesinski [Tue, 22 Nov 2016 00:02:24 +0000 (16:02 -0800)]
Add support for Split APK dependcies
Apps can now declare in their base APK AndroidManifest.xml
that they want to have their split APKs loaded in isolated
Contexts. This means code and resources from the split
get loaded into their own ClassLoader and AssetManager.
<manifest xmlns:android="..."
...
android:isolatedSplits="true"
...
In order to make this more useful, splits can declare dependencies
on other splits, which will all get pulled in to the Context
and run as expected at runtime.
A split declares its dependency on another split by using the
tag <uses-split> in its AndroidManifest.xml:
<manifest xmlns:android="...">
...
<uses-split android:name="feature_split_1" />
...
A split can have a single parent on which it depends on. This is
due to the limitation of having a single ClassLoader parent.
All splits depend on the base APK implicitly.
PackageManager verifies that no cycles exist and that each dependency
is present before allowing an installation to succeed.
The runtime will then load splits based on the dependencies.
Given the following APKs:
base <-- split A <-- split C
^----- split B
If an Activity defined in split C is launched, then the base,
split A, and split C will be loaded into the ClassLoader defined
for the Activity's Context. The AssetManager will similarly be loaded
with the resources of the splits.
A split can be manually loaded by creating a Context for that split, defined
by its name:
Context.createContextForSplit("my_feature_split_1");
All installed Activities, Services, Receivers, and Providers are accessible
to other apps via Intent resolution. When they are instantiated, they are
given the appropriate Context that satisfies any dependencies the split they
were defined in stipulated.
Test: WIP (CTS tests to come)
Change-Id: I8989712b241b7bc84381f2919d88455fcad62161
Peter Qiu [Wed, 25 Jan 2017 02:23:49 +0000 (02:23 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree" am:
28c7afe578 am:
6570ce6c80 am:
704f1bfea4
am:
890cc7e901
Change-Id: I56ae04669ad7e4031cef84489c84cd7230464483
Peter Qiu [Wed, 25 Jan 2017 02:19:45 +0000 (02:19 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree" am:
28c7afe578 am:
6570ce6c80
am:
704f1bfea4
Change-Id: I0ad0256eb12fd4c255dd0c27d7ec8b90d42ccbdc
Peter Qiu [Wed, 25 Jan 2017 02:15:44 +0000 (02:15 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree" am:
28c7afe578
am:
6570ce6c80
Change-Id: I8c232cc7d246b28943d16c1f28121597dad8f215
Peter Qiu [Wed, 25 Jan 2017 02:11:10 +0000 (02:11 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"
am:
28c7afe578
Change-Id: If1b097fb5b9453d1e108534c1fb088dfc92b1b6e
Treehugger Robot [Wed, 25 Jan 2017 02:02:58 +0000 (02:02 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"
Ying Wai (Daniel) Fan [Wed, 25 Jan 2017 02:01:51 +0000 (02:01 +0000)]
Merge "Correct the formula of battery capacity estimation."
TreeHugger Robot [Wed, 25 Jan 2017 01:54:19 +0000 (01:54 +0000)]
Merge "Camera2: Combine API for deferred surface and shared surface"
TreeHugger Robot [Wed, 25 Jan 2017 01:42:42 +0000 (01:42 +0000)]
Merge "Update Status Bar with Badged Wifi Icons."
Jeremy Joslin [Wed, 25 Jan 2017 01:16:42 +0000 (17:16 -0800)]
Implemented network score cache filtering.
NetworkScoreCaches registered with a filter type will now only
receive updates that match their filter criteria.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
34127291
Change-Id: I3d5e6e57b6682707b0734259a2530658ad75dbb7
Ralph Nathan [Wed, 25 Jan 2017 01:32:51 +0000 (01:32 +0000)]
Merge "Add FEATURE_EMBEDDED to PackageManager"
TreeHugger Robot [Wed, 25 Jan 2017 01:25:16 +0000 (01:25 +0000)]
Merge "Added StackWindowContainerController"
Jason Long [Wed, 25 Jan 2017 01:21:39 +0000 (01:21 +0000)]
Merge "Define contract for AutoFillServiceInfo more precisely."
TreeHugger Robot [Wed, 25 Jan 2017 01:20:23 +0000 (01:20 +0000)]
Merge "Add color mode to activity/window"
TreeHugger Robot [Wed, 25 Jan 2017 01:16:28 +0000 (01:16 +0000)]
Merge changes from topic 'bisto-request'
* changes:
Allow privileged app to set media key event listener
Allow privileged app to set volume key long-press listener
Yuichi Araki [Wed, 25 Jan 2017 01:05:21 +0000 (01:05 +0000)]
Merge "AAPT: Add --no-version-transitions flag"
Hongming Jin [Wed, 25 Jan 2017 01:00:52 +0000 (01:00 +0000)]
Merge "Test: AccountManagerService APCT test."
Peng Xu [Wed, 18 Jan 2017 06:16:21 +0000 (22:16 -0800)]
Sensor event direct report mode support API
Add direct report mode support API with stub implementation.
* new SensorDirectChannel class to represent direct channel and
hold related constants.
* new methods in SensorManager to create/destroy direct channel
* new method in SensorManager to config sensor report in direct
channel
* new methods in Sensor to expose direct report related capability
of sensor.
Test: tested with demo app
Bug:
30985702
Change-Id: Ic03c67bea4ed0a728d3d783e95de6c59cf663cca
TreeHugger Robot [Wed, 25 Jan 2017 00:50:17 +0000 (00:50 +0000)]
Merge "Remove accessibility labels of application info and dimiss"
Andrew Sapperstein [Wed, 25 Jan 2017 00:38:50 +0000 (16:38 -0800)]
Decrease frequency of high temp warnings
Instead of showing any time the temp is above throttling temp,
if the user has dismissed the notification (or clicked it), the notification
will not reshow until the temperature has gone below the throttling
temp and come back.
Test: manual
Change-Id: I4cef9144dfcff03a5e70ccd5b12efaab1e74d15b
Fixes:
34346625
Android Build Merger (Role) [Wed, 25 Jan 2017 00:36:19 +0000 (00:36 +0000)]
Merge "Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev am:
ae5d4ff831 am:
8d2ffaefaa"
Adrian Roos [Wed, 25 Jan 2017 00:35:46 +0000 (00:35 +0000)]
Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev am:
ae5d4ff831
am:
8d2ffaefaa
Change-Id: I566523005ac5f21e1033f30d99d220b8f513167c
Android Build Merger (Role) [Wed, 25 Jan 2017 00:35:22 +0000 (00:35 +0000)]
Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout am:
4749930c37 am:
c0f4f0a1dc"
Daniel Nishi [Wed, 25 Jan 2017 00:35:15 +0000 (00:35 +0000)]
Merge "Only count user 0 for diskstats package logging."
Adrian Roos [Wed, 25 Jan 2017 00:34:35 +0000 (00:34 +0000)]
MessagingStyle: Fix buggy measure in MessagingLinearLayout am:
4749930c37
am:
c0f4f0a1dc
Change-Id: Icc4f29c3e6d44aa00159e7355bd5d3957c7905c7
Adrian Roos [Wed, 25 Jan 2017 00:30:43 +0000 (00:30 +0000)]
Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev
am:
ae5d4ff831
Change-Id: Ib76e1da3dbd8b55ff55b3df2f040380e86fd3c35
Adrian Roos [Wed, 25 Jan 2017 00:30:35 +0000 (00:30 +0000)]
MessagingStyle: Fix buggy measure in MessagingLinearLayout
am:
4749930c37
Change-Id: Id664ebb3c07271ff5282daedd29c7f38e79c8776
TreeHugger Robot [Wed, 25 Jan 2017 00:24:33 +0000 (00:24 +0000)]
Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev
Peter Qiu [Wed, 11 Jan 2017 21:39:35 +0000 (13:39 -0800)]
hotspot2: add support for complete PerProviderSubscription/Credential subtree
Added missing fields in Credential subtree for supporting Release 2
and added parsing support for the new fields.
Bug:
34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Ic3665c963ab77ddc4b9a03262517a3c7a4ec3ffc
Peter Qiu [Wed, 11 Jan 2017 19:01:02 +0000 (11:01 -0800)]
hotspot2: add support for complete HomeSP subtree
Added missing fields in HomeSP subtree for supporting Release 2
and added parsing support for the new fields.
Bug:
34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Id2766b6b48be8bd97b56eb7c57a0e8527f38e06c
TreeHugger Robot [Wed, 25 Jan 2017 00:00:04 +0000 (00:00 +0000)]
Merge "Make SettingsProvider reset no-op for now."
Romain Guy [Tue, 24 Jan 2017 01:03:35 +0000 (17:03 -0800)]
Add color mode to activity/window
The color mode lets an application request a wide color gamut for
a specific window. This will also be used in the future to request
HDR. The color mode is currently either default (sRGB) or an undefined
wide gamut color space chosen by the platform. These attributes could
later be used to choose a specific color space if we deem this important
or useful.
This change also renames the various "colorimetry" attributes and
constants to "color mode" for consistency. These symbols were
added in O and can be safely renamed.
Test: CtsColorModeTestCases
Bug:
32984164
Change-Id: I4d4691dd12dbe3f3aa6a5cf893cff39aa16c739e
Android Build Merger (Role) [Tue, 24 Jan 2017 23:53:16 +0000 (23:53 +0000)]
Merge "Merge "unbindBackupAgent and initialize inFullBackup" am:
36654ffef5 am:
3a13bb43f6 am:
6793b1f0b8 am:
c8d9b32db8"
Chris Tate [Tue, 24 Jan 2017 23:52:35 +0000 (23:52 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup" am:
36654ffef5 am:
3a13bb43f6 am:
6793b1f0b8
am:
c8d9b32db8
Change-Id: I19a58876417cd00019c3d5fead9ee6bb48eb3f8d
TreeHugger Robot [Tue, 24 Jan 2017 23:52:26 +0000 (23:52 +0000)]
Merge "Enable kernel UID state updates."