OSDN Git Service

android-x86/frameworks-base.git
6 years agoTrack the global setting of BT A2DP on/off
Sungsoo Lim [Thu, 24 Aug 2017 01:25:06 +0000 (10:25 +0900)]
Track the global setting of BT A2DP on/off

The default phone speaker, bluetooth audio devices, and wired audio
devices are handled as system audio routes. When an app starts to
make sound to a system audio route, the system audio route will be
selected with the following order.

1. The slected route by the app after the latest connection of
   an audio device.
2. The lastly connected audio device.
3. The default phone speaker if not connected.

Bug: 64811580
Test: Passed MediaRouterTest, manual
Change-Id: I77badb14596bc661c44237957504164f5476e595

6 years agoMerge "Skip handling recents toggle if a task is locked." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 04:34:43 +0000 (04:34 +0000)]
Merge "Skip handling recents toggle if a task is locked." into oc-mr1-dev

6 years agoMerge "Use isolated uid to set oom_score_adj" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 03:52:51 +0000 (03:52 +0000)]
Merge "Use isolated uid to set oom_score_adj" into oc-mr1-dev

6 years agoMerge "Update icons to have rounded corner" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 03:12:24 +0000 (03:12 +0000)]
Merge "Update icons to have rounded corner" into oc-mr1-dev

6 years agoMerge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into...
TreeHugger Robot [Thu, 31 Aug 2017 02:50:04 +0000 (02:50 +0000)]
Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev

6 years agoMerge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 02:28:11 +0000 (02:28 +0000)]
Merge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev

6 years agoMerge "Adjusting PiP for the TV IME." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 01:23:03 +0000 (01:23 +0000)]
Merge "Adjusting PiP for the TV IME." into oc-mr1-dev

6 years agoMerge "Fix up bar transitions on low end devices" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 01:03:26 +0000 (01:03 +0000)]
Merge "Fix up bar transitions on low end devices" into oc-mr1-dev

6 years agoMerge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 00:34:57 +0000 (00:34 +0000)]
Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev

6 years agoAt STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread
Wonsik Kim [Wed, 30 Aug 2017 23:28:01 +0000 (16:28 -0700)]
At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread

Fixes: 65210445
Fixes: 64915666
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I73f1cebdd4b990e28f8d466f129e781cba2b5bbf

6 years agoUpdate icons to have rounded corner
Fan Zhang [Wed, 30 Aug 2017 23:41:20 +0000 (16:41 -0700)]
Update icons to have rounded corner

Bug: 65204006
Test: visual
Change-Id: I97baac238495b5a03e91edb18e0a3482f67edf71

6 years agoMerge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev
Zhen Sun [Wed, 30 Aug 2017 23:37:44 +0000 (23:37 +0000)]
Merge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev

6 years agoMerge "Add static lock in PowerProfile" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 23:35:07 +0000 (23:35 +0000)]
Merge "Add static lock in PowerProfile" into oc-mr1-dev

6 years agoMerge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
Phil Weaver [Wed, 30 Aug 2017 23:10:03 +0000 (23:10 +0000)]
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
am: 0ddaa63b67  -s ours

Change-Id: Id403b03e837eafab80ed20271543e82cb74c260b

6 years agoMerge "Add heif format to ExifInterface" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 23:05:12 +0000 (23:05 +0000)]
Merge "Add heif format to ExifInterface" into oc-mr1-dev

6 years agoMerge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
Phil Weaver [Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)]
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev

6 years agoMerge "Don't touch auto dim on app change" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 22:44:35 +0000 (22:44 +0000)]
Merge "Don't touch auto dim on app change" into oc-mr1-dev

6 years agoMerge "Update night display intensity coefficients" into oc-mr1-dev
Christine Franks [Wed, 30 Aug 2017 22:33:01 +0000 (22:33 +0000)]
Merge "Update night display intensity coefficients" into oc-mr1-dev

6 years agoMerge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev

6 years agoMerge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
Paul Mclean [Wed, 30 Aug 2017 22:13:36 +0000 (22:13 +0000)]
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev

6 years agoMerge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 22:11:52 +0000 (22:11 +0000)]
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev

6 years agoFixes NPE thrown in sort if new targets are added.
Kang Li [Wed, 30 Aug 2017 21:18:11 +0000 (14:18 -0700)]
Fixes NPE thrown in sort if new targets are added.

Test: manually tested it to verify that it works as expected.

Bug: 65035399
Change-Id: Ie99b05c5324f47cbac66687d7301ef62a7c83e55

6 years agoFix up bar transitions on low end devices
Jason Monk [Wed, 30 Aug 2017 21:05:24 +0000 (17:05 -0400)]
Fix up bar transitions on low end devices

 - Don't allow dark icons, because the backdrop is always dark.
 - Don't show the view when we aren't showing notification icons or
   system info, because the view may need to be transparent.

Test: manual
Change-Id: I5572a6379ceb605b21a1982db00fdf1659593b8a
Fixes: 62549040

6 years agoWebView: fix setSafeBrowsingWhitelist table in docs
Nate Fischer [Tue, 29 Aug 2017 23:17:22 +0000 (16:17 -0700)]
WebView: fix setSafeBrowsingWhitelist table in docs

No change to logic, only docs changes.

The documentation for setSafeBrowsingWhitelist uses a table to describe
whitelist rules. However, this table was previously formatted
incorrectly (it uses <th> elements for each cell, when normal data cells
should use <td> according to Android API guidelines).

This fixes the table to conform to the guidelines, adjusts white space
for consistency, and removes an unnecessary <p> element.

Bug: 65173825
Test: make docs (and manually verify the table looks correct)
Change-Id: I5d7390a44613aaa3acb147a69f8e0ce741e817ed

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:52:19 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Make slight API and doc adjustments" into oc-mr1-dev
Hall Liu [Wed, 30 Aug 2017 20:41:53 +0000 (20:41 +0000)]
Merge "Make slight API and doc adjustments" into oc-mr1-dev

6 years agoATV a11y shortcut (CL 1 of 3): Update key chord
Zhen Sun [Thu, 17 Aug 2017 22:56:20 +0000 (15:56 -0700)]
ATV a11y shortcut (CL 1 of 3): Update key chord

Changed accessibility shortcut key chord from [HOME + DPAD_CENTER] to
[BACK + DPAD_DOWN]. (Followed logic in ag/1939791.)
Specified AudioAttributes of TV dialog ringtone to
USAGE_ASSISTANCE_ACCESSIBILITY since this dialog is meant to show up for
accessibility shortcut feature and that will also enable Android TVs to
play ringtone for the warning dialog.

Bug: 64346294
Test: Manually use key chord to trigger accessibility shortcut.
Change-Id: Iacb29400079551a3c3ded6f8391b7541bc1c9f29

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:35:52 +0000 (20:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:31:03 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:29:57 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:28:10 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:24:40 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:23:09 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoDon't touch auto dim on app change
Jason Monk [Wed, 30 Aug 2017 20:17:19 +0000 (16:17 -0400)]
Don't touch auto dim on app change

Test: manual
Bug: 63630024
Change-Id: I134aa2695bad36606588ca3e52685826f25ea306

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:11:03 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:04:56 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Adding back recents grow in split screen" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Merge "Adding back recents grow in split screen" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoUpdate night display intensity coefficients
Christine Franks [Thu, 27 Jul 2017 00:51:16 +0000 (17:51 -0700)]
Update night display intensity coefficients

Bug: 64019890
Test: manual - adjust intensity slider
Change-Id: I38ec7385b36367e5c9f6c606e65a982efbd32a1b

6 years agoMerge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
Jeff Sharkey [Wed, 30 Aug 2017 19:01:18 +0000 (19:01 +0000)]
Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev

6 years agoMerge "Setting a wallpaper must be synchronous" into oc-mr1-dev
Chris Tate [Wed, 30 Aug 2017 18:44:03 +0000 (18:44 +0000)]
Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev

6 years agoAdd heif format to ExifInterface
Chong Zhang [Fri, 25 Aug 2017 23:20:01 +0000 (16:20 -0700)]
Add heif format to ExifInterface

Get heif dimension and rotation from MediaMetadataRetriever.

Bug: 64077740
Change-Id: I711ac70d356dbfd9128a30ab33c0dfd81a4ae17e

6 years agoMerge "Adds ERROR state to ImsConfig" into oc-mr1-dev
Brad Ebinger [Wed, 30 Aug 2017 18:31:43 +0000 (18:31 +0000)]
Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev

6 years agoMerge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 17:47:46 +0000 (17:47 +0000)]
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev

6 years agoBatteryStats: Don't schedule work when shutting down
Adam Lesinski [Wed, 30 Aug 2017 02:30:31 +0000 (19:30 -0700)]
BatteryStats: Don't schedule work when shutting down

Prevent more work from being queued when BatteryStats is
shutting down.

Bug: 64901294
Test: manual
Change-Id: Ifc74a4405b40c949e440d6d65fdd13ec40920429

6 years agoAdding USB audio-class 2.0 spec descriptors.
Paul McLean [Fri, 7 Jul 2017 14:14:52 +0000 (08:14 -0600)]
Adding USB audio-class 2.0 spec descriptors.

Added USB audio-class 2.0 format type descriptors.
Added Tree parsing.
Rearchitected reporting (again) to better support reuse and scale.

Bug: 64301464

Test: Run code against representative USB audio peripherals and verify
that each correctly handles or ignores all descriptors and the correct
device semantics (headset / not-headset) are still calculated.

Change-Id: I1b3b01ab1cd804ed876bf6427c3afba15eea6a6e

6 years agoAugment network stats based on SubscriptionPlan.
Jeff Sharkey [Tue, 29 Aug 2017 21:32:13 +0000 (15:32 -0600)]
Augment network stats based on SubscriptionPlan.

When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI.  For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.

Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.

Thorough testing to verify behavior.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug: 64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca

6 years agoMerge "Set CPU Abis for updated system packages" into oc-mr1-dev
Todd Kennedy [Wed, 30 Aug 2017 13:48:28 +0000 (13:48 +0000)]
Merge "Set CPU Abis for updated system packages" into oc-mr1-dev

6 years agoIntroduce SmartSelectionEventTracker.
Abodunrinwa Toki [Tue, 15 Aug 2017 14:05:11 +0000 (15:05 +0100)]
Introduce SmartSelectionEventTracker.

This will be used for logging text selection interaction.

Bug: 64914512
Test: No test. Everything builds fine.
Change-Id: Idb28864e0fc969be05d81855b2e7cd8389bd835e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 04:00:33 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ied35c473af7c2834bc145269270d41c1fbb7563e

6 years agoMerge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 03:54:06 +0000 (03:54 +0000)]
Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 03:53:42 +0000 (20:53 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I1dbe08a427134a196041d6b68a220fc2a6a991d8

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Id452855fd3f6af7d1daaa2aede1baa65a78c557f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 02:35:20 +0000 (19:35 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I67b019a8fa6529ad6540e9c2cc784a413b411fe3

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 02:29:09 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I16a811e84d3642459e686c84dcc5cecbbf5ada9b

6 years agoMerge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev
Tim Murray [Wed, 30 Aug 2017 02:13:38 +0000 (02:13 +0000)]
Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 02:10:49 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I48522f7eba9fae610d5551a3dcdf6292a4a0abb8

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 02:04:00 +0000 (19:04 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ic27c4ce111ea2a017cec2e66812e922991152666

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 01:57:44 +0000 (18:57 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I4eebbdb73bfd8558666b22135de33f7183ee8ee0

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 01:51:00 +0000 (18:51 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I77ff98cb6d61c557fb070c8ba9939bc7dd5637cd

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 01:43:54 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I6792eb7fe4f28b87cd53504b0c8318a751f33c27

6 years agoMerge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 01:24:04 +0000 (01:24 +0000)]
Merge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev

6 years agoMerge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into...
TreeHugger Robot [Wed, 30 Aug 2017 00:57:23 +0000 (00:57 +0000)]
Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Added system_server to system group" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 00:53:33 +0000 (00:53 +0000)]
Merge "Added system_server to system group" into oc-mr1-dev

6 years agoMerge "Make shutdown logging thread-safe" into oc-mr1-dev
Fyodor Kupolov [Wed, 30 Aug 2017 00:19:29 +0000 (00:19 +0000)]
Merge "Make shutdown logging thread-safe" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 23:56:50 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoSetting a wallpaper must be synchronous
Christopher Tate [Tue, 29 Aug 2017 23:50:13 +0000 (16:50 -0700)]
Setting a wallpaper must be synchronous

Observable state needs to be fully established by the time the
caller is allowed to proceed, otherwise they might read stale
information.  In particular, we hadn't yet committed changes to
the backing store by the time observers were released, so they
could then read a stale generation number as the "current" state.

With this fix, the flaky CTS test is now reliably passing.

Test: cts-tradefed run cts-dev -m CtsAppTestCases -t android.app.cts.WallpaperManagerTest\#setBitmapTest
Bug: 65016846
Change-Id: I93fc690caedfbcd455a91625a3c67fff9168483b

6 years agoMerge "Note cross-user permission requirement for relevant wallpaper operations"...
TreeHugger Robot [Tue, 29 Aug 2017 23:47:50 +0000 (23:47 +0000)]
Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev

6 years agoMerge "Prevent getting large bitmap log error for gobo" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 23:41:47 +0000 (23:41 +0000)]
Merge "Prevent getting large bitmap log error for gobo" into oc-mr1-dev

6 years agoRevert "Fix transition between two occluding activities"
Tim Murray [Tue, 29 Aug 2017 23:21:27 +0000 (23:21 +0000)]
Revert "Fix transition between two occluding activities"

This reverts commit 791ccc00aae7647d146646e4c8ec0d5e2f5bd4ed.

bug 65168260

Change-Id: Ib4bb2c694a7dc6c2359143b07edecaf894a2daee

6 years agoAuto dim the nav bar to help prevent diff aging
Jason Monk [Tue, 29 Aug 2017 22:58:00 +0000 (18:58 -0400)]
Auto dim the nav bar to help prevent diff aging

Test: runtest systemui
Bug: 63630024
Change-Id: If2a6c0934f8751f82c027dbb3b5f103a34dc78d4

6 years agoresolve merge conflicts of 490d397d284f to oc-dr1-dev
Phil Weaver [Tue, 29 Aug 2017 20:43:01 +0000 (13:43 -0700)]
resolve merge conflicts of 490d397d284f to oc-dr1-dev

Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b
Change-Id: Ib00a23ae9a329cfc102b1a116b5a585be36b56f6

6 years agoAdd static lock in PowerProfile
jackqdyulei [Thu, 3 Aug 2017 22:46:52 +0000 (15:46 -0700)]
Add static lock in PowerProfile

Before this cl, there exists nullpointer crash in PowerProfile in
following part:

"sPowerMap.containsKey(key) && (Double) sPowerMap.get(key) > 0"

To my best knowledge, it is because in
PowerUsageSummary.SummaryProvider, we may create batterystats in
meantime:
1. setListening is invoked in worker thread, in which we will force
update the batterystats.
2. In setListening we will register receiver, which may update
batterystats through onReceive in UI thread.

This cl adds static lock in PowerProfile, making the init part can
only be accessed by an thread at a time.

Bug: 64209576
Test: Manual
Change-Id: I00bc094f44416669b4f0e11e647b0fae2ff61013

6 years agoMerge changes I34c4a0c3,Iebc7d153,Ibb028886 into oc-mr1-dev
Hugo Benichi [Tue, 29 Aug 2017 22:29:08 +0000 (22:29 +0000)]
Merge changes I34c4a0c3,Iebc7d153,Ibb028886 into oc-mr1-dev

* changes:
  Nat464Xlat: interface notification handler on ConnectivityService
  Nat464Xlat: internal state guards cleanup + state enum
  Nat464Xlat: clat management cleanup

6 years agoMerge "Use localized strings for HD Audio option label" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 22:22:12 +0000 (22:22 +0000)]
Merge "Use localized strings for HD Audio option label" into oc-mr1-dev

6 years agoMerge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev
Jean-Michel Trivi [Tue, 29 Aug 2017 22:11:35 +0000 (22:11 +0000)]
Merge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev

6 years agoSkip handling recents toggle if a task is locked.
Winson Chung [Tue, 29 Aug 2017 21:56:01 +0000 (14:56 -0700)]
Skip handling recents toggle if a task is locked.

- When a task is locked, the logic will still try to start the recents
  activity (but will fail since it's a lock mode violation).  Nothing
  resets the state, so the button will stop responding.  Instead, skip
  handling of the button until the user unlocks the task.  Also add a
  final fallback for resetting the waiting state, whenever an app
  transition completes.

Bug: 65059121
Test: Launch app after pinning app, tap the recents button, and then
      un-pin and try to re-enter recents.

Change-Id: I0215957f041241b5a61d7fd5b784410368bbd996

6 years agoMerge "Track conference start in system elapsed time." into oc-mr1-dev
Tyler Gunn [Tue, 29 Aug 2017 21:22:56 +0000 (21:22 +0000)]
Merge "Track conference start in system elapsed time." into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 29 Aug 2017 21:14:29 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: db61e7ec73  -s ours

Change-Id: I1ef8dabac664c06ead9dffa6a515cd9fd50e2175

6 years agoMerge "Handle alternate status values." into oc-mr1-dev
Tyler Gunn [Tue, 29 Aug 2017 21:06:20 +0000 (21:06 +0000)]
Merge "Handle alternate status values." into oc-mr1-dev

6 years agoMerge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 21:01:05 +0000 (21:01 +0000)]
Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev

6 years agoSet CPU Abis for updated system packages
Koji Fukui [Tue, 22 Aug 2017 07:51:11 +0000 (16:51 +0900)]
Set CPU Abis for updated system packages

Symptom:
If Chrome package is updated and is disabled after reboot, all apps are
crashed when they use WebView.

Root cause:
CPU Abis for updated system packages are not set when newer version
exist. Updated system packages are not fully scanned.
But WebView can use WebViewProvider in the system Chrome package. It
refers CPU Abis and crash happens.

Solution:
Set CPU Abis even if the system package has newer updated version.

Fixes: 64926227
Fixes: 62980149
Test: Manual
Change-Id: I1ddc7be5a5b8928189410e30a0506d11279d0279

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 20:53:24 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 29 Aug 2017 20:38:19 +0000 (13:38 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ic2c86003ba40e7884913155316bf5c9eae7dc514

6 years agoMerge "Fix ListView can not be moved after rotation." into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 20:09:56 +0000 (20:09 +0000)]
Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev

6 years agoMerge "Add shadow to adaptive icons to the shared sheet Test: manual Bug: 65015602...
TreeHugger Robot [Tue, 29 Aug 2017 19:54:26 +0000 (19:54 +0000)]
Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug: 65015602" into oc-mr1-dev

6 years agoMake shutdown logging thread-safe
Fyodor Kupolov [Tue, 29 Aug 2017 19:12:03 +0000 (12:12 -0700)]
Make shutdown logging thread-safe

Previously TRON_METRICS/SHUTDOWN_TIMINGS_LOG were accessed from
different threads. Now all access is properly synchronized.

Important: Moved saveMetrics from rebootOrShutdown. rebootOrShutdown
can be called directly from SystemServer class after reboot when
no metrics were collected.

Test: manual reboot/shutdown and verify that metrics are logged
Bug: 64815357
Change-Id: I7b02c9c6b10b920ce3532a0808ab71a0d6e07d2b

6 years agoMerge "Fix tooltips for views in a popup window" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 19:08:30 +0000 (19:08 +0000)]
Merge "Fix tooltips for views in a popup window" into oc-mr1-dev

6 years agoScreen-pinning unpin security fails for secondary user. DO NOT MERGE
Amith Yamasani [Mon, 28 Aug 2017 16:41:22 +0000 (09:41 -0700)]
Screen-pinning unpin security fails for secondary user. DO NOT MERGE

The setting that inidcates that the user must unlock the device first
to unpin an app is always read for the owner user, so if the owner
disables this it will also be disabled for all secondary users no
matter what they have selected.

Bug: 64235463
Test: Manual
- Enable Screen-pinning for owner
- Uncheck 'Ask for PIN when unpinning'
- Create a secondary user
- Create keyguard PIN
- Enable screen-pinning for secondary user
- Check 'Ask for PIN when unpinning'
- Exit settings and start an app
- Pin the app from recents
- Unpin the app
The keyguard should appear on unpin with this commit applied
Change-Id: I8b9a98dc50e061b14c091d723223577cd94513ab

6 years agoAudioService: log changes in OP_PLAY_AUDIO
Jean-Michel Trivi [Mon, 28 Aug 2017 19:40:55 +0000 (12:40 -0700)]
AudioService: log changes in OP_PLAY_AUDIO

Log changes to AppOpsManager.OP_PLAY_AUDIO in live player

Test: "adb shell dumpsys audio" after entering silence mode
Bug: 62258749
Bug: 64286665
Change-Id: Ia1c202c5b8b25e14f7c2e85060a256dc69433909

6 years agoPrevent getting large bitmap log error for gobo
Matthew Ng [Tue, 29 Aug 2017 18:24:58 +0000 (11:24 -0700)]
Prevent getting large bitmap log error for gobo

Forgotten to move a line of code to the area to ignore loading large
bitmaps causing an error log. The code related is ag/2579729.

Test: manual - boot gobo device and read log
Change-Id: Iaeedf80b6fa25331f7db09e21db84574a53939b3
Fixes: 65127030

6 years agoMerge "Backport overlay security fix" into oc-dev
Phil Weaver [Tue, 29 Aug 2017 18:08:54 +0000 (18:08 +0000)]
Merge "Backport overlay security fix" into oc-dev

6 years agoMerge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev
Sudheer Shanka [Tue, 29 Aug 2017 17:40:33 +0000 (17:40 +0000)]
Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev

6 years agoFix ListView can not be moved after rotation.
Jiongxuan Gao [Thu, 24 Nov 2016 11:20:27 +0000 (20:20 +0900)]
Fix ListView can not be moved after rotation.

Symptom:
"Share with" popup displayed incompletely, and cannot be slid after
rotated the screen twice.

Root cause:
Since ChooserActivity's configChanges attribute contains
"screenSize|orientation" , when user rotates device, Android will
not recreate ChooserActivity, its content view ResolverDrawerLayout
is also not recreated. In ResolverDrawerLayout's onMeasure, it will
call getHeightUsed to calculate the ListView's height. getHeightUsed
will check against the lowest child view plus padding and margin
instead of the actual measured height of the ListView. This lets the
ListView hang off the edge when all of the content would fit on-screen
. Because of ResolverDrawerLayout has not been drawn yet, we can not
get the actual showing items' count of ListView before it's drawn, the
result of getChildCount for ListView will return the value in landscape
mode. The heightUsed of ListView might be smaller. mCollapsibleHeight
will be 0. When received a move action, the mCollapseOffset and new
position might both be 0.

Solution:
When configuration changed, we should rebuild the list and refresh
adapter's data set. Just like onRestart does.

Bug: 34365764

Change-Id: I4be0f9afc68588fbb0d8d152c41509650d04c754

6 years agoFix GATT client leakage when scan is throttled (1/2)
Jakub Pawlowski [Mon, 28 Aug 2017 11:12:49 +0000 (04:12 -0700)]
Fix GATT client leakage when scan is throttled (1/2)

Currently, scan throttling happens after client is registered, but
before the scan is started. This might lead to scan client being leaked.
This patch fixed that by moving check before client registration.

Bug: 64887233
Test: manual
Change-Id: I22ae624a0c51110cb69679f796926e3b2b36d0ac
Merged-In: I22ae624a0c51110cb69679f796926e3b2b36d0ac
(cherry picked from commit ee02e1ce774777e85b10be6d1ad5c6083fa08c18)

6 years agoMerge "Remove activity from stopping activities once resumed." into oc-mr1-dev
Bryce Lee [Tue, 29 Aug 2017 17:13:58 +0000 (17:13 +0000)]
Merge "Remove activity from stopping activities once resumed." into oc-mr1-dev

6 years agoMerge "DeviceInfoUtils.java: support to show kernel version compiled with clang"...
Nick Desaulniers [Tue, 29 Aug 2017 16:37:28 +0000 (16:37 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang" into oc-mr1-dev

6 years agoMerge "AudioService: log volume commands and origin" into oc-mr1-dev
Jean-Michel Trivi [Tue, 29 Aug 2017 16:35:45 +0000 (16:35 +0000)]
Merge "AudioService: log volume commands and origin" into oc-mr1-dev

6 years agoAdds ERROR state to ImsConfig
Brad Ebinger [Fri, 25 Aug 2017 21:53:30 +0000 (14:53 -0700)]
Adds ERROR state to ImsConfig

Adds the ERROR return state for bool provisioning values
so that we can throw an Exception in some cases.

Bug: 64540800
Test: Manual
Change-Id: I0b79837c694d245999031ec65783857e114b7c75

6 years agoMerge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev
Jorim Jaggi [Tue, 29 Aug 2017 11:32:07 +0000 (11:32 +0000)]
Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev

* changes:
  Fix transition between two occluding activities
  Use Keyguard orientation when unoccluding