OSDN Git Service
Chenjie Yu [Sun, 10 Dec 2017 16:31:05 +0000 (08:31 -0800)]
use running sum for ValueMetricProducer bucket
simplify ValueMetricProducer logic for pulled data
Test: unit test
Change-Id: Ic0a21a543166cc5c34c1fa505dba08d1fc2f510a
Joe Onorato [Thu, 14 Dec 2017 05:33:33 +0000 (05:33 +0000)]
Merge "Fix how we build the statsd protos."
Yao Chen [Thu, 14 Dec 2017 05:18:20 +0000 (05:18 +0000)]
Merge "Remove dead code in statsd"
TreeHugger Robot [Thu, 14 Dec 2017 04:38:56 +0000 (04:38 +0000)]
Merge "StatsdStats alerts -rename alerted_times"
TreeHugger Robot [Thu, 14 Dec 2017 04:09:55 +0000 (04:09 +0000)]
Merge "Give SliceManagerService a concept of pinned slices."
TreeHugger Robot [Thu, 14 Dec 2017 04:01:53 +0000 (04:01 +0000)]
Merge "Adding ability to control how the USB data is dumped."
Hugo Benichi [Thu, 14 Dec 2017 03:36:22 +0000 (03:36 +0000)]
Merge "Extend connectivity OWNERS" am:
64c2488056 am:
3304263594
am:
e3f872cf06 -s ours
Change-Id: If6d6d69ce6411d2974fb46a789decd4af4ff02a0
TreeHugger Robot [Thu, 14 Dec 2017 03:29:50 +0000 (03:29 +0000)]
Merge "Keyguard can be on even if not showing"
Hugo Benichi [Thu, 14 Dec 2017 03:25:36 +0000 (03:25 +0000)]
Merge "Extend connectivity OWNERS" am:
64c2488056
am:
3304263594
Change-Id: I816a15beedcfc9f200d00da7282e54992a096555
Hugo Benichi [Thu, 14 Dec 2017 03:15:04 +0000 (03:15 +0000)]
Merge "Extend connectivity OWNERS"
am:
64c2488056
Change-Id: I07622a82cac394a52f5e17a9f33e6bbbe68b61ea
Yi Jin [Thu, 14 Dec 2017 03:02:03 +0000 (03:02 +0000)]
Merge "Create a new stream option which generates field name to id mapping recursively for all its submessages."
Treehugger Robot [Thu, 14 Dec 2017 02:56:40 +0000 (02:56 +0000)]
Merge "Extend connectivity OWNERS"
TreeHugger Robot [Thu, 14 Dec 2017 02:44:37 +0000 (02:44 +0000)]
Merge "Disable object pool for lifecycler"
Benedict Wong [Thu, 14 Dec 2017 02:41:28 +0000 (02:41 +0000)]
Merge "Convert IpSecService resources to use refcounting" am:
b6ba8fd49d am:
8698b33cc2
am:
c475898995
Change-Id: Ib18839d7dff8e25898f81e877337fbb8cb24cc7b
Felipe Leme [Thu, 14 Dec 2017 02:33:32 +0000 (02:33 +0000)]
Proper autofill fix to let phone process autofill Settings activity. am:
2f58b03ea1 am:
4a8d9b628f -s ours am:
f4c26d98a6 -s ours
am:
b7664ec84c -s ours
Change-Id: I43743a438ac37859972b73611ef8083246f0112c
Joe Onorato [Sun, 19 Nov 2017 04:32:56 +0000 (20:32 -0800)]
Fix how we build the statsd protos.
This lets us include frameworks protos, and use the constants
and messages from them.
Change-Id: I609d6e524f780e6a5beea543a68561bede47813e
Test: make
Jason Monk [Thu, 14 Dec 2017 02:21:12 +0000 (02:21 +0000)]
Merge "Add AppComponentFactory API"
Benedict Wong [Thu, 14 Dec 2017 02:20:20 +0000 (02:20 +0000)]
Merge "Convert IpSecService resources to use refcounting" am:
b6ba8fd49d
am:
8698b33cc2
Change-Id: I9645df5304d7f11068d190cbdaccfe83ca0580bc
Felipe Leme [Thu, 14 Dec 2017 02:12:06 +0000 (02:12 +0000)]
Proper autofill fix to let phone process autofill Settings activity. am:
2f58b03ea1 am:
4a8d9b628f -s ours
am:
f4c26d98a6 -s ours
Change-Id: I568f64d403ef03dfec91b99dd4e0e224631b38b7
Benedict Wong [Thu, 14 Dec 2017 02:00:41 +0000 (02:00 +0000)]
Merge "Convert IpSecService resources to use refcounting"
am:
b6ba8fd49d
Change-Id: I88a67008ea88f40aff918422c085fa9add3aeba3
Felipe Leme [Thu, 14 Dec 2017 02:00:35 +0000 (02:00 +0000)]
Proper autofill fix to let phone process autofill Settings activity. am:
2f58b03ea1
am:
4a8d9b628f -s ours
Change-Id: Idecee1722d2f0cb504fb591caa0dc1609361e392
Felipe Leme [Thu, 14 Dec 2017 01:57:45 +0000 (01:57 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev am:
f2eddf8df9
am:
a30443b141 -s ours
Change-Id: Icf16062deca61f22308759512a2348b258fbc4bc
Felipe Leme [Thu, 14 Dec 2017 01:49:36 +0000 (01:49 +0000)]
Proper autofill fix to let phone process autofill Settings activity.
am:
2f58b03ea1
Change-Id: Ia167badcdb5fee60a62c9cf0932150b54180ba0b
Benedict Wong [Thu, 14 Dec 2017 01:45:15 +0000 (01:45 +0000)]
Merge "Convert IpSecService resources to use refcounting"
Felipe Leme [Thu, 14 Dec 2017 01:43:23 +0000 (01:43 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev
am:
f2eddf8df9
Change-Id: I7603e96214ca4e97985b6678cb0e75b7e36d0880
Mohammed Khider [Thu, 14 Dec 2017 01:16:50 +0000 (01:16 +0000)]
Merge "Duty Cycling and Low Power Mode GNSS feature implementations"
TreeHugger Robot [Thu, 14 Dec 2017 01:15:51 +0000 (01:15 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev
TreeHugger Robot [Thu, 14 Dec 2017 01:10:07 +0000 (01:10 +0000)]
Merge "Fix WifiTrackerTest stopTrackingShouldRemove . . ."
TreeHugger Robot [Thu, 14 Dec 2017 01:00:15 +0000 (01:00 +0000)]
Merge changes Iff6557fc,Ie1686e82,I88972653,Iab60b4df,Ie25460e7
* changes:
Handles failure for transaction queue full
Reorganize use of error code enums
Removes setters from NanoAppInstanceInfo
Renames nanoapp instance IDs to handles in ContextHubService
Creates a NanoAppStateManager at ContextHubService
Hugo Benichi [Sat, 9 Dec 2017 03:57:41 +0000 (12:57 +0900)]
Extend connectivity OWNERS
Also remove 'build.master@android.com' which is deprecated, not
declared by anybody else, and makes the linter unhappy.
Bug:
70394432
Test: built
Merged-In: I9c0ba41386129379f82259fcc5e745562b014fae
(cherry pick from commit
626eed2ac826a34b3ac9b1d4ddb9a783222187ec)
Change-Id: Ie802113d61f693d73f7234b44ac2a9bd462b3fbf
TreeHugger Robot [Thu, 14 Dec 2017 00:43:34 +0000 (00:43 +0000)]
Merge "AAPT2: Push more configuration code into the parser"
TreeHugger Robot [Thu, 14 Dec 2017 00:31:14 +0000 (00:31 +0000)]
Merge "Use vector instead of deprecated ScopedVector"
TreeHugger Robot [Thu, 14 Dec 2017 00:17:15 +0000 (00:17 +0000)]
Merge "Remove gap applying night display and color mode"
Yao Chen [Thu, 14 Dec 2017 00:01:55 +0000 (16:01 -0800)]
Remove dead code in statsd
Remove dead code and shared lib.
And fix a bug in ValueMetricProducer
Test: statsd_test & manual
Change-Id: Ie76bfc02e14ae6a0fa9f8933751fd06397de9411
TreeHugger Robot [Thu, 14 Dec 2017 00:04:18 +0000 (00:04 +0000)]
Merge "Refactor PackageParser.collectCerts() to hide signature scheme."
Bookatz [Wed, 13 Dec 2017 23:21:57 +0000 (15:21 -0800)]
StatsdStats alerts -rename alerted_times
Renaming declared_times to alerted_times.
Test: still compiles and passes tests
Change-Id: Ib7c890a21bb91a7185c6d3a098b1bec8bd868ad5
TreeHugger Robot [Wed, 13 Dec 2017 23:53:50 +0000 (23:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Philip P. Moltmann [Wed, 13 Dec 2017 23:40:20 +0000 (23:40 +0000)]
Merge "Switch to modern ArgumentMatchers"
Hugo Benichi [Wed, 13 Dec 2017 23:36:51 +0000 (23:36 +0000)]
Merge "Extend connectivity OWNERS"
Yohei Yukawa [Wed, 13 Dec 2017 23:36:41 +0000 (23:36 +0000)]
Merge "SoftInput flag requires focused View to show IME"
TreeHugger Robot [Wed, 13 Dec 2017 23:30:59 +0000 (23:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Benedict Wong [Thu, 16 Nov 2017 23:27:22 +0000 (15:27 -0800)]
Convert IpSecService resources to use refcounting
This is part 2 of 2 of the refcounting refactor for IpSecService
resources.
Switched ManagedResources to use RefcountedResource structure for
managing reference counts and eventual cleanup. Further, resource arrays
and quota management have been aggregated into a UserRecord for better
isolation. UID access checking has been similarly moved into the
UserRecordTracker, and resourceId checking has been rolled into
RefcountedResourceArray's accessor methods.
Bug:
63409385
Test: CTS, all unit tests run on aosp_marlin-eng, new tests added
Change-Id: Iee52dd1c9d2583bb6bfaf65be87569e9d50a5b63
Chen Xu [Wed, 13 Dec 2017 23:20:30 +0000 (23:20 +0000)]
Merge "new carrier id APIs"
TreeHugger Robot [Wed, 13 Dec 2017 23:16:59 +0000 (23:16 +0000)]
Merge "Only create ProtoOutputStream when onGetData() is called."
TreeHugger Robot [Wed, 13 Dec 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Add job ids in the sync log."
Andrii Kulian [Wed, 13 Dec 2017 22:46:43 +0000 (14:46 -0800)]
Disable object pool for lifecycler
In the case when client lives in system_server, we shouldn't
recycle the lifecycle transaction objects to the pool.
Disabled this feature for now.
Bug:
70616950
Test: Manual
Change-Id: Ib70096aa35accfeb93108f60e3cfe8440b9cd6e8
Jeff Sharkey [Wed, 13 Dec 2017 22:48:03 +0000 (22:48 +0000)]
Merge "Start accepting Executors instead of Handlers."
Ta-wei Yen [Wed, 13 Dec 2017 22:29:36 +0000 (22:29 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am:
8244ebfc4e am:
a02bbdb8d8
am:
3d89874bb5
Change-Id: I6b1882e006a7b708c5979b4970a2ddc9be35f93b
Siarhei Vishniakou [Wed, 13 Dec 2017 21:48:50 +0000 (13:48 -0800)]
Keyguard can be on even if not showing
It is possible for keyguard to be in "restricted input" state even if
isKeyguardShowingAndNotOccluded returns false. The previous CL to
deprecate inKeyguardRestrictedInputMode has also changed the behaviour
of isKeyguardLocked. Return to the old behaviour here, but keep the API
deprecated.
Bug:
70411251
Test: 1) add Google account to phone 2) Enable google assistant and set
up active edge to trigger the assistant 3) Ensure phone is in the
always-on-display mode 4) Squeeze the phone to trigger the assistant.
Previously, the assistant would not launch. The expected behaviour is
that assistant gets launched. Without this change, display will turn on
but the assistant will not get launched.
Change-Id: Ic299f3fc223ebdc3b0f6eea97cb4a89a3142e44a
Ta-wei Yen [Wed, 13 Dec 2017 22:17:45 +0000 (22:17 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am:
8244ebfc4e
am:
a02bbdb8d8
Change-Id: Ife2c39388ab647b0e4f5677d920da780b6eb39ca
Android Build Merger (Role) [Wed, 13 Dec 2017 22:13:03 +0000 (22:13 +0000)]
Merge "Merge "Add reference counted resources to IpSecService" am:
e11366f38a am:
adb6437fea am:
012739e9ad"
Benedict Wong [Wed, 13 Dec 2017 22:11:20 +0000 (22:11 +0000)]
Merge "Add reference counted resources to IpSecService" am:
e11366f38a am:
adb6437fea
am:
012739e9ad
Change-Id: Iae17a5d33d71e8abf24211cbf2b215520f45c619
TreeHugger Robot [Wed, 13 Dec 2017 22:09:55 +0000 (22:09 +0000)]
Merge "Add OWNERS for dreams"
Ta-wei Yen [Wed, 13 Dec 2017 22:07:17 +0000 (22:07 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled"
am:
8244ebfc4e
Change-Id: Iea3c38056e17abc09af7f7d933cbb9627575d8ee
Benedict Wong [Wed, 13 Dec 2017 22:00:26 +0000 (22:00 +0000)]
Merge "Add reference counted resources to IpSecService" am:
e11366f38a
am:
adb6437fea
Change-Id: I927ac534570b3836510e0fb4feda8cf544f5a9e4
Treehugger Robot [Wed, 13 Dec 2017 21:56:12 +0000 (21:56 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled"
Benedict Wong [Wed, 13 Dec 2017 21:50:19 +0000 (21:50 +0000)]
Merge "Add reference counted resources to IpSecService"
am:
e11366f38a
Change-Id: If218f4c241199e22e3295a5bcb049980d7949f4e
TreeHugger Robot [Wed, 13 Dec 2017 21:45:11 +0000 (21:45 +0000)]
Merge "Bug fix for device idle mode light"
gomo [Sat, 11 Nov 2017 04:35:46 +0000 (20:35 -0800)]
Duty Cycling and Low Power Mode GNSS feature implementations
Implementaion of 2 GNSS Android-P features:
- The Duty Cycling API to enable high accuracy applications development
- The Low Power Mode GNSS API to save power when indoor
Bug:
64009176
Test: Existing unit tests still pass.
Change-Id: I3ba3b86a635a54927c694fdd66a038757e843937
TreeHugger Robot [Wed, 13 Dec 2017 21:38:14 +0000 (21:38 +0000)]
Merge "Fix deadlock when fetching active voice interaction service component."
Benedict Wong [Wed, 13 Dec 2017 21:33:38 +0000 (21:33 +0000)]
Merge "Add reference counted resources to IpSecService"
TreeHugger Robot [Wed, 13 Dec 2017 21:12:32 +0000 (21:12 +0000)]
Merge "Make DevicePolicyManager.isAffiliatedUser public"
Jeff Sharkey [Wed, 13 Dec 2017 00:26:23 +0000 (17:26 -0700)]
Start accepting Executors instead of Handlers.
After discussion in API council, our new best-practices are to have
developers provide an Executor to dispatch callbacks/listeners on,
instead of the previous guidance of using a Handler.
Define Context.getMainExecutor() to easily obtain an Executor
associated with the main thread of application. This allows new
APIs to require a @NonNull Executor. Also define a new
@CallbackExecutor auto-doc annotation that explains background and
points developers at new Context method above.
Test: cts-tradefed run commandAndExit cts-dev -m CtsContentTestCases -t android.content.cts.ContextTest#testMainLooper
Test: cts-tradefed run commandAndExit cts-dev -m CtsContentTestCases -t android.content.cts.ContextTest#testMainExecutor
Bug:
70348426
Change-Id: I536892bcd80fcfba1bb1ddf67648c08a26d7ddd2
Colin Cross [Wed, 13 Dec 2017 20:55:23 +0000 (20:55 +0000)]
Merge "Make services.core the final priorityboosted jar" am:
a0c1780d3c am:
93de069ec9
am:
ff6fcaec0b
Change-Id: I6ba33f829ed72ee799b4855021ba1f136ea49bd4
TreeHugger Robot [Wed, 13 Dec 2017 20:50:13 +0000 (20:50 +0000)]
Merge "SkPixelSerialize is deprecated (and unneeded in this case)"
Colin Cross [Wed, 13 Dec 2017 20:43:20 +0000 (20:43 +0000)]
Merge "Make services.core the final priorityboosted jar" am:
a0c1780d3c
am:
93de069ec9
Change-Id: Ib1a626060f2e2d617ca0b51e016cc7e06cae27d8
Jason Monk [Thu, 16 Nov 2017 22:15:37 +0000 (17:15 -0500)]
Add AppComponentFactory API
API to allow some classloader control over instantiation of
items from application's manifest. Unlike the first attempt
this does not encourage developers to extend Application, it simply
provides a small surface to allow control over the creation of objects
like Activities, Services, Receivers, and Providers.
Test: manual
Bug:
70623879
Change-Id: Idcab7c60f54ce3f4575ac29dcdcae321cf458bf3
Paul McLean [Mon, 11 Dec 2017 15:36:41 +0000 (08:36 -0700)]
Adding ability to control how the USB data is dumped.
Also added tracing to android.UsbDevice creation.
Test: Try each dump command with CALYX Pat USB DAC & Dragonfly Red USB DAC
Change-Id: I2ec05dfa9c544d0c50ee59e3b990e9010cbe0aa0
Colin Cross [Wed, 13 Dec 2017 20:33:28 +0000 (20:33 +0000)]
Merge "Make services.core the final priorityboosted jar"
am:
a0c1780d3c
Change-Id: I4969cd15085ab460a112547e63362bf8c2bc1602
Shane Farmer [Mon, 27 Nov 2017 21:19:36 +0000 (13:19 -0800)]
AAPT2: Push more configuration code into the parser
When parsing is complete, we now have a list of output artifacts that
have their referential integrity validated. This means that once the
configuration file is parsed, the only errors that can occur are related
to APK processing, and not the configuration itself.
This reduces the number of errors that could cause a partial output of
APK artifacts. It simplifies the public API and reduces the complexity of
the code to generate multiple APKs.
Test: Ran unit tests
Test: manually ran the optimize command to ensure it still works
Change-Id: I3f2d885b207a84c958f5348a4baa6718598184a4
Dan Cashman [Fri, 8 Dec 2017 22:02:51 +0000 (14:02 -0800)]
Refactor PackageParser.collectCerts() to hide signature scheme.
PackageParser shoudln't really need to know the gory details of APK
verification, it should just get back the blobs it needs to do its
job. Move the package verification into its own class which is
*almost* exclusively responsible for verifying app signatures. This
is in preparation for adding APK signature scheme v3, which will add
yet another way to do this.
Bug:
64686581
Test: Builds 'n' boots without issue.
Test: android.appsecurity.cts.PkgInstallSignatureVerificationTest passes.
Change-Id: Ieb76b2353bd44ffdb83e7b894e5ad720d1697dc7
Dan Albert [Wed, 13 Dec 2017 20:18:57 +0000 (20:18 +0000)]
Merge "Include what we use." am:
b0efcc1f68 am:
afa15b0846
am:
83a1241e5a
Change-Id: I829bad9fe74620b40599eeba745743679e04eba6
Colin Cross [Wed, 13 Dec 2017 20:16:19 +0000 (20:16 +0000)]
Merge "Make services.core the final priorityboosted jar"
Sanket Padawe [Wed, 13 Dec 2017 20:15:10 +0000 (20:15 +0000)]
Merge "Receiving side Call handover API implementation."
Luke Song [Wed, 13 Dec 2017 20:11:50 +0000 (20:11 +0000)]
Merge "Separate volume ui and safety warning configs"
Dan Albert [Wed, 13 Dec 2017 20:07:04 +0000 (20:07 +0000)]
Merge "Include what we use." am:
b0efcc1f68
am:
afa15b0846
Change-Id: I1f4ba5196d1118cfcd68821fa8ac0fbd17d8b5fc
TreeHugger Robot [Wed, 13 Dec 2017 20:02:54 +0000 (20:02 +0000)]
Merge "Improvements to loadtest app."
Makoto Onuki [Wed, 13 Dec 2017 20:01:45 +0000 (12:01 -0800)]
Add job ids in the sync log.
Bug
69141914
Test: manual
Change-Id: Ib8966506c3bb4f666cf50eb55962343fd5df63c9
Dan Albert [Wed, 13 Dec 2017 19:52:11 +0000 (19:52 +0000)]
Merge "Include what we use."
am:
b0efcc1f68
Change-Id: Ic75bda75c80be19ee7f0f865ffd9e4f8c70fe785
Treehugger Robot [Wed, 13 Dec 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Include what we use."
Jason Monk [Wed, 6 Dec 2017 13:56:33 +0000 (08:56 -0500)]
Give SliceManagerService a concept of pinned slices.
Allow launcher/assistant to pin slices. Also allow other apps
with access to a slice to pin it dynamically by adding a listener
to it. Dynamic pinnings can expire when the host app dies because
the binder will no longer be alive.
Public docs and unhiding will come in a later CL with CTS tests.
Bug:
68378571
Test: runtest --path frameworks/base/services/tests/uiservicestests
Change-Id: I1dd9a839f547fc949922b766ba4b54e6d50f3125
TreeHugger Robot [Wed, 13 Dec 2017 19:19:53 +0000 (19:19 +0000)]
Merge "Add an API for setting a new brightness curve."
Winson Chung [Wed, 13 Dec 2017 19:08:39 +0000 (11:08 -0800)]
Fix deadlock when fetching active voice interaction service component.
- Notify AM whenever the active voice interaction service changes and
dependency on VoiceInteractionManagerService from AM.
Bug:
70616466
Test: android.server.am.ActivityManagerAssistantStackTests
Change-Id: Ifd3dcbf0b6afc7b3e8a1d9d29bacd5b04af2a15d
TreeHugger Robot [Wed, 13 Dec 2017 19:03:04 +0000 (19:03 +0000)]
Merge "Enable init.rc for statsd to start statsd by default in boot time"
Arthur Ishiguro [Thu, 30 Nov 2017 17:48:00 +0000 (09:48 -0800)]
Handles failure for transaction queue full
Bug:
67734082
Test: Compile only
Change-Id: Iff6557fcade8da5adf849ebd84118838b2c99d67
Arthur Ishiguro [Wed, 29 Nov 2017 19:54:51 +0000 (11:54 -0800)]
Reorganize use of error code enums
For consistency use client-facing error code enums in
ContextHubServiceTransaction, and convert as necessary within
the ContextHubTransactionManager class.
Bug:
67734082
Test: None
Change-Id: Ie1686e826b6390b11418a7bd8b0119030c89cadb
Arthur Ishiguro [Mon, 11 Dec 2017 20:24:15 +0000 (12:24 -0800)]
Removes setters from NanoAppInstanceInfo
Removing these fields since they are not public APIs,
and is not used internally in the service.
Bug:
67734082
Test: None
Change-Id: I8897265365849ab5d0106849e41d16577a91ead9
Arthur Ishiguro [Mon, 11 Dec 2017 23:15:44 +0000 (15:15 -0800)]
Renames nanoapp instance IDs to handles in ContextHubService
Use handles to refer to nanoapp instances at the service to be
consistent with the terminology at NanoAppInstanceInfo, and to
reduce confusion with other instance IDs (e.g. ones maintained
in the CHRE implementation).
Bug:
67734082
Test: None
Change-Id: Iab60b4df20383907668824ac95c3f5a1a559ee6b
Arthur Ishiguro [Tue, 21 Nov 2017 23:33:21 +0000 (15:33 -0800)]
Creates a NanoAppStateManager at ContextHubService
Created to decouple the internal nanoapp state management at the
service with ContextHubService class
Bug:
67734082
Test: Compile and flash, run CHQTS and verify pass, also verify with
logs that the cache is updated accordingly after load/unload/query
Change-Id: Ie25460e7f8d903cdcb22f0a1c4870bb93ccbad3e
Android Build Merger (Role) [Wed, 13 Dec 2017 18:53:48 +0000 (18:53 +0000)]
Merge "Merge "renderthread: relax error handling for wide gamut EGL configs" am:
50666fa217 am:
c1ad3c5f29 am:
7818322b62 -s ours"
Dmitry Shmidt [Wed, 13 Dec 2017 18:52:01 +0000 (18:52 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs" am:
50666fa217 am:
c1ad3c5f29
am:
7818322b62 -s ours
Change-Id: Ifbc3e4db63fb618574dcd74993414f75e683372f
TreeHugger Robot [Wed, 13 Dec 2017 18:51:07 +0000 (18:51 +0000)]
Merge "Fix identation for switch statement."
Mike Reed [Wed, 13 Dec 2017 18:43:16 +0000 (13:43 -0500)]
SkPixelSerialize is deprecated (and unneeded in this case)
Test: make
Change-Id: Icc421586de82a516cb5e32b60949315d1108a9a3
Luke Song [Tue, 12 Dec 2017 20:27:08 +0000 (12:27 -0800)]
Separate volume ui and safety warning configs
VR headsets want to prevent 2d volume ui from being displayed, but want
to keep the high volume warning dialog.
Bug:
67951608
Bug:
68997348
Test: Tested linearly independent configs
Change-Id: Ic102ce626e199d2e3a3cf8fbb091050977c696bb
Jordan Liu [Wed, 13 Dec 2017 18:20:12 +0000 (18:20 +0000)]
Merge "Unhide signal strength carrier config"
Dmitry Shmidt [Wed, 13 Dec 2017 18:16:43 +0000 (18:16 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs" am:
50666fa217
am:
c1ad3c5f29
Change-Id: I81a582d7ad20f062803963a3dc43ddcec288c8ec
Dmitry Shmidt [Wed, 13 Dec 2017 18:04:19 +0000 (18:04 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
am:
50666fa217
Change-Id: Ic97b3742278bcdb2b5ec7b0540a7f7252c5472a4
Dmitry Shmidt [Wed, 13 Dec 2017 17:51:47 +0000 (17:51 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
Alex Chau [Wed, 13 Dec 2017 12:44:31 +0000 (12:44 +0000)]
Make DevicePolicyManager.isAffiliatedUser public
- Simplified javadoc on device affiliation concept. "affiliated with the
device" will be used to describe affiliation with device owner user,
as defined in #isAffiliatedUser javadoc.
- Link to #isAffiliatedUser whenever device affiliation is mentioned
Bug:
67582080
Test: None
Change-Id: I4395ff980aa1626d6ff352d2f16777887784082c
Bo Hu [Wed, 13 Dec 2017 16:56:12 +0000 (16:56 +0000)]
Merge "Check wifi feature before starting wifi service"