git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Kevin Chyn [Thu, 12 Apr 2018 00:51:34 +0000 (17:51 -0700)]

Merge "Fix FingerprintDialogView when show is called before animation is complete" into pi-dev
am: 74ebf9a87c

Change-Id: I8d042491ca867ac2f2e2f213f50bf5fa90a0c961

commit | commitdiff | tree

Kevin Chyn [Thu, 12 Apr 2018 00:46:17 +0000 (17:46 -0700)]

Merge "Fix FingerprintService package comparison" into pi-dev
am: 3535a0a64c

Change-Id: I282f53a8399128ecb35fc6894b1914a149d98f8e

commit | commitdiff | tree

TreeHugger Robot [Thu, 12 Apr 2018 00:17:27 +0000 (00:17 +0000)]

Merge "Fix FingerprintDialogView when show is called before animation is complete" into pi-dev

commit | commitdiff | tree

Jovana Knezevic [Thu, 12 Apr 2018 00:17:26 +0000 (17:17 -0700)]

Merge "Fixes clicking on foreground user in the switcher." into pi-dev
am: a153811ad1

Change-Id: I3b7a6f0e6d8c62661ae7aa758207379173454bac

commit | commitdiff | tree

TreeHugger Robot [Thu, 12 Apr 2018 00:16:55 +0000 (00:16 +0000)]

Merge "Fix FingerprintService package comparison" into pi-dev

commit | commitdiff | tree

Jovana Knezevic [Thu, 12 Apr 2018 00:01:11 +0000 (00:01 +0000)]

Merge "Fixes clicking on foreground user in the switcher." into pi-dev

commit | commitdiff | tree

Suprabh Shukla [Wed, 11 Apr 2018 23:54:52 +0000 (16:54 -0700)]

Merge "Updating strings for activity interceptor dialog" into pi-dev
am: 3e5b5076a2

Change-Id: Ifedcc426f81670c705408f01638c69a761044dff

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 23:39:46 +0000 (23:39 +0000)]

Merge "Updating strings for activity interceptor dialog" into pi-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Apr 2018 23:14:26 +0000 (16:14 -0700)]

Merge "APIs to disable data usage notifications." into pi-dev
am: f0b9fbebc0

Change-Id: I7b5bd380f00b6e94da79f43b354ecfc52df3f8e4

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Apr 2018 23:05:37 +0000 (23:05 +0000)]

Merge "Merge "Only show mobile data turn off dialog once." into pi-dev am: cb87872137" into pi-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 23:05:03 +0000 (23:05 +0000)]

Merge "APIs to disable data usage notifications." into pi-dev

commit | commitdiff | tree

Amin Shaikh [Wed, 11 Apr 2018 23:04:56 +0000 (16:04 -0700)]

Merge "Only show mobile data turn off dialog once." into pi-dev
am: cb87872137

Change-Id: Ic71adc13f67d84beee0caab59103235b3e430200

commit | commitdiff | tree

Erik Kline [Wed, 11 Apr 2018 23:04:47 +0000 (16:04 -0700)]

[automerger skipped] Merge "Don't unnecessarily reevaluate tethering provisioning" am: f0e598b550
am: 5dea720c45 -s ours

Change-Id: I876420f3afb2a0aade2d2639d7587113f6302b86

commit | commitdiff | tree

Erik Kline [Wed, 11 Apr 2018 22:57:24 +0000 (15:57 -0700)]

Merge "Don't unnecessarily reevaluate tethering provisioning"
am: f0e598b550

Change-Id: Iba76e0fea962ca738160f6cbbaa31b66465bdfcc

commit | commitdiff | tree

Kweku Adams [Wed, 11 Apr 2018 22:55:01 +0000 (15:55 -0700)]

Merge "Updating BatteryStats to account for Ambient Display sipper." into pi-dev
am: 5d9498a62c

Change-Id: Id2a3bb41586790366a945946bbb3326a4c7de142

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 22:50:51 +0000 (22:50 +0000)]

Merge "Only show mobile data turn off dialog once." into pi-dev

commit | commitdiff | tree

Jovana Knezevic [Wed, 11 Apr 2018 22:48:45 +0000 (15:48 -0700)]

Merge "Adds user broadcasts to UserManagerHelper." into pi-dev
am: ccb8eb3858

Change-Id: I22c968bfa6f1f70c175f04c5b2bd15f8509ed002

commit | commitdiff | tree

Allen Webb [Wed, 11 Apr 2018 22:43:44 +0000 (15:43 -0700)]

Merge "keystore: Add documentation for user presence required." into pi-dev
am: 01cdfc4996

Change-Id: I94df735709041b182b3e1cde929d61c9d16cf6c0

commit | commitdiff | tree

jovanak [Tue, 10 Apr 2018 22:14:50 +0000 (15:14 -0700)]

Fixes clicking on foreground user in the switcher.

When foreground user is clicked, keyguard should be dismissed. If other user is clicked, we should switch to that user.

Bug: 77653809
Bug: 77808082
Test: Switcher tested in emulator and mojave by clicking on foreground and non-foreground users.
Change-Id: I72e56f8e157419ea05f155be647c11e6d98bde2c

commit | commitdiff | tree

Chet Haase [Wed, 11 Apr 2018 22:38:23 +0000 (15:38 -0700)]

Merge "Add targetSdk check around new LinearLayout weighted measure behavior" into pi-dev
am: f24335ec85

Change-Id: I6a3d25fc7b4c03be19847fa988f6119d1eb5e1bc

commit | commitdiff | tree

Mihai Popa [Wed, 11 Apr 2018 22:33:51 +0000 (15:33 -0700)]

Merge "[Magnifier-39] Hide both handles on overlap" into pi-dev
am: aeed443b5b

Change-Id: I66773f70d0ec5ec4923215c3aa4b59894a1f2890

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 22:28:17 +0000 (22:28 +0000)]

Merge "Updating BatteryStats to account for Ambient Display sipper." into pi-dev

commit | commitdiff | tree

Mihai Popa [Wed, 11 Apr 2018 22:27:59 +0000 (15:27 -0700)]

Merge "Fix ripple effect for floating toolbar menu items" into pi-dev
am: 6afcf2fb4d

Change-Id: Ic94b1ca619219268a1af233b61cc8df1f380c980

commit | commitdiff | tree

Jovana Knezevic [Wed, 11 Apr 2018 22:20:33 +0000 (22:20 +0000)]

Merge "Adds user broadcasts to UserManagerHelper." into pi-dev

commit | commitdiff | tree

Allen Webb [Wed, 11 Apr 2018 22:19:28 +0000 (22:19 +0000)]

Merge "keystore: Add documentation for user presence required." into pi-dev

commit | commitdiff | tree

Jovana Knezevic [Wed, 11 Apr 2018 22:18:24 +0000 (15:18 -0700)]

Merge "Separates current process user and foreground user" into pi-dev
am: a512d304ca

Change-Id: Id876cfb4c06ffae5f2268fb53a6cfaddfd15bd4d

commit | commitdiff | tree

Chet Haase [Wed, 11 Apr 2018 22:17:44 +0000 (22:17 +0000)]

Merge "Add targetSdk check around new LinearLayout weighted measure behavior" into pi-dev

commit | commitdiff | tree

Mihai Popa [Wed, 11 Apr 2018 22:15:35 +0000 (22:15 +0000)]

Merge "[Magnifier-39] Hide both handles on overlap" into pi-dev

commit | commitdiff | tree

Mihai Popa [Wed, 11 Apr 2018 22:14:51 +0000 (22:14 +0000)]

Merge "Fix ripple effect for floating toolbar menu items" into pi-dev

commit | commitdiff | tree

Jeff Sharkey [Tue, 10 Apr 2018 18:38:29 +0000 (12:38 -0600)]

APIs to disable data usage notifications.

Certain carriers have requested the ability to disable the warning,
limit, and rapid data usage notifications shown by the OS, so give
them that ability on a per-subId basis. (The notifications are still
enabled by default.)

Unhide NOT_CONGESTED to match setSubscriptionOverrideCongested().

Fix bug in getPrimarySubscriptionPlanLocked() to find the first
currently active plan; the first non-recurring plan may be no longer
active. Fix bug in SubscriptionPlan which allowed invalid negative
or zero-length Period objects.

Bug: 77851691, 77506882, 77662747
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: atest android.telephony.cts.SubscriptionManagerTest
Exempt-From-Owner-Approval: SDK deadline, responding to API feedback
Change-Id: Ib6e6dbadd5022937c3f0661ab4b66aa617f0b5af

commit | commitdiff | tree

Jovana Knezevic [Wed, 11 Apr 2018 22:06:15 +0000 (22:06 +0000)]

Merge "Separates current process user and foreground user" into pi-dev

commit | commitdiff | tree

Tracy Zhou [Wed, 11 Apr 2018 21:49:22 +0000 (14:49 -0700)]

Merge "Update the recents onboarding UI to the latest mock." into pi-dev
am: 68e4c45eed

Change-Id: I0e4a58951718d2522ba4f181e8f329460d1f1b9c

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Apr 2018 21:47:53 +0000 (21:47 +0000)]

Merge "Don't unnecessarily reevaluate tethering provisioning"

commit | commitdiff | tree

Rohan Shah [Wed, 11 Apr 2018 21:44:19 +0000 (14:44 -0700)]

Merge "[QS] Update mobile tile secondary text" into pi-dev
am: 497bc2cbe9

Change-Id: Ice200394d0acf6168da955442cc1ada308c181f7

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Apr 2018 21:38:27 +0000 (14:38 -0700)]

Merge "Lint to identify "deprecated at birth" APIs." into pi-dev
am: 992f6120c0

Change-Id: I0f734d9a3d6746d5d828919b74d2603eba0bcf02

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 21:36:31 +0000 (21:36 +0000)]

Merge "Update the recents onboarding UI to the latest mock." into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 21:29:20 +0000 (21:29 +0000)]

Merge "[QS] Update mobile tile secondary text" into pi-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Apr 2018 21:25:51 +0000 (21:25 +0000)]

Merge "Lint to identify "deprecated at birth" APIs." into pi-dev

commit | commitdiff | tree

Philip P. Moltmann [Wed, 11 Apr 2018 20:54:01 +0000 (13:54 -0700)]

Merge "Properly disconnect after skipping an operation." into pi-dev
am: cd7a174c59

Change-Id: Ida1308d4746001e818177bf6cdbfa0ec85a2afe2

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 20:44:32 +0000 (20:44 +0000)]

Merge "Properly disconnect after skipping an operation." into pi-dev

commit | commitdiff | tree

Hall Liu [Wed, 11 Apr 2018 20:30:18 +0000 (13:30 -0700)]

Merge "Make setServiceId a TestApi" into pi-dev
am: d41e669fca

Change-Id: I0ca985c9741b3f710c636595b7eb9b2b326e67fb

commit | commitdiff | tree

Sunny Goyal [Wed, 11 Apr 2018 20:22:37 +0000 (13:22 -0700)]

Merge "Fixing missing reportDrawFinish method in windowCallbacksCompat" into pi-dev
am: 5000367d38

Change-Id: I4c2d4cbef2f3cae9c9f61c1a5fa5126b26d10aa7

commit | commitdiff | tree

Hall Liu [Wed, 11 Apr 2018 20:21:48 +0000 (20:21 +0000)]

Merge "Make setServiceId a TestApi" into pi-dev

commit | commitdiff | tree

Erik Kline [Wed, 28 Feb 2018 06:01:35 +0000 (15:01 +0900)]

Don't unnecessarily reevaluate tethering provisioning

Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.

Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toward WiFi works
Bug: 69565814
Merged-In: If254326e892b78ef9daf620f829c1def136d695c
Merged-In: I288093a1d76566e72d4889d92c7aedafc318c8b6
Merged-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8

Change-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8
(cherry picked from commit 1b450e3eb9106a9cc73dfc144d275141dd5017ef)

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Apr 2018 20:09:25 +0000 (20:09 +0000)]

Merge "Merge "Cleanup after updating Vehicle permissions" into pi-dev am: 8b73c1126a" into pi-dev-plus-aosp

commit | commitdiff | tree

Kai [Wed, 11 Apr 2018 20:08:04 +0000 (13:08 -0700)]

Merge "Cleanup after updating Vehicle permissions" into pi-dev
am: 8b73c1126a

Change-Id: I5687a87169717d7dd55166c2b0c2a57aecbfa452

commit | commitdiff | tree

Erik Kline [Wed, 11 Apr 2018 20:05:45 +0000 (13:05 -0700)]

[automerger skipped] Don't unnecessarily reevaluate tethering provisioning
am: 1b450e3eb9 -s ours

Change-Id: I4a2b78be3a8d5fc07398d2d070fca90e0c11c6fb

commit | commitdiff | tree

Sunny Goyal [Wed, 11 Apr 2018 20:01:01 +0000 (20:01 +0000)]

Merge "Fixing missing reportDrawFinish method in windowCallbacksCompat" into pi-dev

commit | commitdiff | tree

Julia Reynolds [Wed, 11 Apr 2018 19:55:55 +0000 (12:55 -0700)]

Merge "Show onboarding screen from dnd tile" into pi-dev
am: b2943a864e

Change-Id: I38450b8983c6be32d0a5a7fca757eb031764c13a

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 19:50:50 +0000 (19:50 +0000)]

Merge "Cleanup after updating Vehicle permissions" into pi-dev

commit | commitdiff | tree

Daniel Cashman [Wed, 11 Apr 2018 19:40:33 +0000 (12:40 -0700)]

Merge "Add SigningInfo class to expose package signing details." into pi-dev
am: 960a0c6c57

Change-Id: I512db4ad4f81da5cdd61bb2de5f3ed0e719379c1

commit | commitdiff | tree

Julia Reynolds [Wed, 11 Apr 2018 19:36:41 +0000 (19:36 +0000)]

Merge "Show onboarding screen from dnd tile" into pi-dev

commit | commitdiff | tree

Jack Yu [Wed, 11 Apr 2018 19:29:29 +0000 (12:29 -0700)]

Merge "DO NOT MERGE - Hide IWLAN system API" into pi-dev
am: 10fb6582eb

Change-Id: Ica3ee854446d0a2f0b596d2c7bc6381ebf963584

commit | commitdiff | tree

Kevin Chyn [Wed, 11 Apr 2018 19:28:59 +0000 (12:28 -0700)]

Fix FingerprintService package comparison

Test: manual test following steps b/77633366 comment #4

Change-Id: I623c5bb3bf5af669752deab602a94747277affd4
Fixes: 77633366

commit | commitdiff | tree

Yangster-mac [Wed, 11 Apr 2018 19:24:31 +0000 (12:24 -0700)]

Merge "Trim the invalid uids and tags when reading uids/tags from chain." into pi-dev
am: 9054656c20

Change-Id: I3c67a3842b3444d1dbc068917500db908a383b9c

commit | commitdiff | tree

Allen Webb [Tue, 10 Apr 2018 17:33:42 +0000 (10:33 -0700)]

keystore: Add documentation for user presence required.

Test: make -j50 docs
Bug: 77600728
Change-Id: I6334bc0fc7a7d4faced6b03522c350ce74303443
Signed-off-by: Allen Webb <allenwebb@google.com>

commit | commitdiff | tree

Daniel Cashman [Wed, 11 Apr 2018 19:21:07 +0000 (19:21 +0000)]

Merge "Add SigningInfo class to expose package signing details." into pi-dev

commit | commitdiff | tree

Amin Shaikh [Wed, 11 Apr 2018 19:20:32 +0000 (15:20 -0400)]

Only show mobile data turn off dialog once.

Change-Id: I9eb8c27ea08f67478e2aacfa091a1320bac828ae
Fixes: 77909752
Test: manual

commit | commitdiff | tree

David Pursell [Wed, 11 Apr 2018 19:19:21 +0000 (12:19 -0700)]

Merge "MessageQueue: explicitly remove FD event listeners." into pi-dev
am: 6f42d1bac2

Change-Id: Ia2f49f6d20d495fcc01e1a5a42a0be207042c92f

commit | commitdiff | tree

Shawn Willden [Wed, 11 Apr 2018 19:13:54 +0000 (12:13 -0700)]

Merge "Mark CTS-tested APIs as @TestApi" into pi-dev
am: 98831af78b

Change-Id: Ia2cd2684380aca372e912af9aeda343246df924e

commit | commitdiff | tree

Wei Jia [Wed, 11 Apr 2018 19:08:14 +0000 (12:08 -0700)]

Merge "BufferingParams: add annotation @TestApi" into pi-dev
am: fb052cc3c0

Change-Id: I292beb9a2e88c2ca680412002e82ec4426ec9cf6

commit | commitdiff | tree

Erik Kline [Wed, 28 Feb 2018 06:01:35 +0000 (15:01 +0900)]

Don't unnecessarily reevaluate tethering provisioning

Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.

Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toward WiFi works
Bug: 69565814
Merged-In: If254326e892b78ef9daf620f829c1def136d695c
Merged-In: I288093a1d76566e72d4889d92c7aedafc318c8b6

Change-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8

commit | commitdiff | tree

Jason Monk [Wed, 11 Apr 2018 18:56:07 +0000 (11:56 -0700)]

Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev
am: c2375d9b3d

Change-Id: Id7145e9d6432586d295f59b67a4f3b7e44d935b1

commit | commitdiff | tree

jovanak [Mon, 2 Apr 2018 23:40:15 +0000 (16:40 -0700)]

Separates current process user and foreground user

User switcher wrongly called methods on the current process user,
which is always User 0 for SysUI.

Instead, user switcher requires knowledge about foreground user.
The process of user switching = changing the foreground
user.

Split tests between unit and robolectric.
Robolectric tests enable shadowing ActivityManager and UserHandle.

Fixes:77485524
Test: Unit and robolectric tests.
Change-Id: I20cc32f132ce48b4507a6907bdc9d103c04f4a30

commit | commitdiff | tree

Colin Cross [Wed, 11 Apr 2018 18:44:45 +0000 (11:44 -0700)]

Merge "Revert "Update docs to match encryption requirements"" into pi-dev
am: fcbbb72603

Change-Id: I7b66ab3cb2362a6fa91d90b4b7237d6f3760b406

commit | commitdiff | tree

Nathan Harold [Wed, 11 Apr 2018 18:39:56 +0000 (11:39 -0700)]

Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev
am: 68e5f0f242

Change-Id: I2542b4dcb94b306e3fe2e3e87051f1bd6a481561

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 18:36:31 +0000 (18:36 +0000)]

Merge "DO NOT MERGE - Hide IWLAN system API" into pi-dev

commit | commitdiff | tree

Sunny Goyal [Wed, 11 Apr 2018 18:29:24 +0000 (11:29 -0700)]

Fixing missing reportDrawFinish method in windowCallbacksCompat

Test: Verified on launcher that there is no ANR
Bug: 77695434
Change-Id: I1c382ea24fee15835637ed9d4055161a99ff3625

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 18:29:40 +0000 (18:29 +0000)]

Merge "Trim the invalid uids and tags when reading uids/tags from chain." into pi-dev

commit | commitdiff | tree

Tracy Zhou [Sun, 8 Apr 2018 06:54:46 +0000 (23:54 -0700)]

Update the recents onboarding UI to the latest mock.

Screenshot: https://screenshot.googleplex.com/ks6kWo0R2gd

Bug: 70180942
Test: manual test
Change-Id: Iabe6431db59e0539db5a1952cbb07f95ed6fa7ed

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 18:20:42 +0000 (18:20 +0000)]

Merge "Add filegroup for supporting apache-http stubs generation." into pi-dev-plus-aosp

commit | commitdiff | tree

Bookatz [Wed, 11 Apr 2018 18:19:33 +0000 (11:19 -0700)]

Merge "StatsManager throws exceptions" into pi-dev
am: 6b317915e8

Change-Id: I3de523046404285f3bcc7bfff598393d7c16820d

commit | commitdiff | tree

Alex Chau [Wed, 11 Apr 2018 18:13:30 +0000 (11:13 -0700)]

Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev
am: 87646514be

Change-Id: I083f1e5c59090340be8afbd4c5178db16ef12772

commit | commitdiff | tree

Bryce Lee [Wed, 11 Apr 2018 18:09:37 +0000 (11:09 -0700)]

Merge "Ensure ActivityStack's cached resumed activity is updated." into pi-dev
am: 6f14dc95cf

Change-Id: I1cda8ecb6e0878ffd133a35b32259171991762b2

commit | commitdiff | tree

David Pursell [Wed, 11 Apr 2018 18:05:52 +0000 (18:05 +0000)]

Merge "MessageQueue: explicitly remove FD event listeners." into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 18:03:44 +0000 (18:03 +0000)]

Merge "Mark CTS-tested APIs as @TestApi" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 18:01:24 +0000 (18:01 +0000)]

Merge "BufferingParams: add annotation @TestApi" into pi-dev

commit | commitdiff | tree

David Brazdil [Wed, 11 Apr 2018 17:57:56 +0000 (10:57 -0700)]

Merge "Greylist methods with varargs and intrinsics" into pi-dev
am: 1eff922e34

Change-Id: I2cf0a3459b3723aa263d5ae6ca4dafe3a589181d

commit | commitdiff | tree

Chavi Weingarten [Wed, 11 Apr 2018 17:52:25 +0000 (10:52 -0700)]

Merge "Synchronize stack position and size update for split screen" into pi-dev
am: 9553a11557

Change-Id: Ie9308010a2c856284aca2fdc53304e3b79a080bb

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 17:52:22 +0000 (17:52 +0000)]

Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev

commit | commitdiff | tree

Anton Philippov [Wed, 11 Apr 2018 17:48:40 +0000 (10:48 -0700)]

Merge "Pass app version to agent in adb restore for kv." into pi-dev
am: 133f93bbbb

Change-Id: I8c16ca2f13a7c03fd754928422b736658a53f779

commit | commitdiff | tree

Julia Reynolds [Wed, 11 Apr 2018 17:40:24 +0000 (10:40 -0700)]

Merge "Update volume logging" into pi-dev
am: 259bdbf43d

Change-Id: I98caa2367c2aa6cf569685147cd4a71efc78ab6c

commit | commitdiff | tree

Colin Cross [Wed, 11 Apr 2018 17:28:39 +0000 (17:28 +0000)]

Merge "Revert "Update docs to match encryption requirements"" into pi-dev

commit | commitdiff | tree

Colin Cross [Wed, 11 Apr 2018 17:27:24 +0000 (17:27 +0000)]

Revert "Update docs to match encryption requirements"

This reverts commit cebb55ea9d98dc7ba93eed520b874ac24ff96800.

Reason for revert: broke docs builds

Change-Id: I3a4b8d274141efec90fae2ed0b9324194288c635

commit | commitdiff | tree

Mathew Inwood [Wed, 11 Apr 2018 17:19:04 +0000 (10:19 -0700)]

Merge "Configurable sampling rate for hidden API access log events." into pi-dev
am: fb55bd8706

Change-Id: I734dffcd6c993bf718d6835a734be26de5d76780

commit | commitdiff | tree

jovanak [Tue, 10 Apr 2018 22:59:11 +0000 (15:59 -0700)]

Adds user broadcasts to UserManagerHelper.

Same broadcasts supported by UserSwitcherController.

Car User switcher listens to user changes.
Switcher needs to hear when the user is switched to dismiss the
keyguard,which causes the switching animation to terminate.

Bug:77653809
Test: Unit tests.
Change-Id: I633cbd9045e7254dcc173ca0e1118fca06c669df

commit | commitdiff | tree

Yao Chen [Wed, 11 Apr 2018 17:10:46 +0000 (10:10 -0700)]

Merge "Handle logd reconnect." into pi-dev
am: 2e0f45f087

Change-Id: I15cdb063331da9b1e6479d598314fb1cf05ab9f1

commit | commitdiff | tree

Nathan Harold [Wed, 11 Apr 2018 17:09:07 +0000 (17:09 +0000)]

Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev

commit | commitdiff | tree

Adrian Roos [Wed, 11 Apr 2018 17:06:56 +0000 (10:06 -0700)]

Merge "DisplayCutout: Draw anti-aliased bounds in soft overlay" into pi-dev
am: 2370f368d4

Change-Id: Ifae0d5e2c5bc226eaaf4462dd9b9cb044c8340b8

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 17:02:06 +0000 (17:02 +0000)]

Merge "StatsManager throws exceptions" into pi-dev