OSDN Git Service
Jorim Jaggi [Thu, 12 Jul 2018 23:14:10 +0000 (16:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE Remove WTF spam" into pi-dev am:
650ead619e
am:
bdc73423c6 -s ours
Change-Id: I82b11d019dce0127cce0178f356cd83a4ef39046
Winson Chung [Thu, 12 Jul 2018 23:12:23 +0000 (16:12 -0700)]
[automerger skipped] Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev am:
7775af2778
am:
684eb30cb4 -s ours
Change-Id: I860033381de790bc76a587c8cda34666214681a0
Bill Yi [Thu, 12 Jul 2018 22:57:59 +0000 (15:57 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0 am:
d9bd9d1c04 am:
4ab42d5b8a
am:
387f121e26
Change-Id: If5410e44a19cd119b31401a6aa47025ebc24bca1
Bill Yi [Thu, 12 Jul 2018 22:45:06 +0000 (15:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours am:
afb05522f1 -s ours am:
f85971f3a2 -s ours am:
698e7ebb0b -s ours
am:
4b53224b3b -s ours
Change-Id: I9853b4496e0e67d8163aba5a6e137bdaad019663
Dan Shi [Thu, 12 Jul 2018 22:39:51 +0000 (22:39 +0000)]
Merge "Add tests in gce-presubmit-am.gcl and gce-postsubmit-am.gcl to TEST_MAPPING"
TreeHugger Robot [Thu, 12 Jul 2018 22:15:41 +0000 (22:15 +0000)]
Merge "GiveAudioStatusHandler and test."
Jorim Jaggi [Thu, 12 Jul 2018 22:09:20 +0000 (15:09 -0700)]
Merge "DO NOT MERGE Remove WTF spam" into pi-dev
am:
650ead619e
Change-Id: I6d4300530516c25a5eb9af8ea8f924591eff3b95
Winson Chung [Thu, 12 Jul 2018 21:46:31 +0000 (14:46 -0700)]
Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev
am:
7775af2778
Change-Id: I54d224436509531cfd0e33cce97d8471c0867447
Jorim Jaggi [Thu, 12 Jul 2018 21:32:53 +0000 (21:32 +0000)]
Merge "DO NOT MERGE Remove WTF spam" into pi-dev
Bill Yi [Thu, 12 Jul 2018 21:31:15 +0000 (14:31 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0 am:
d9bd9d1c04
am:
4ab42d5b8a
Change-Id: I5afb90731ccdc2afc1df7c9ac45f9efaa0820ac5
Brad Stenning [Thu, 12 Jul 2018 21:30:45 +0000 (21:30 +0000)]
Merge "Initial include of the CarSystemUI package"
Bill Yi [Thu, 12 Jul 2018 21:16:01 +0000 (14:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours am:
afb05522f1 -s ours am:
f85971f3a2 -s ours
am:
698e7ebb0b -s ours
Change-Id: I005a54804323515e99552fc4bde76bc079d78f35
Bill Yi [Thu, 12 Jul 2018 21:07:31 +0000 (14:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours am:
847b7d112e -s ours am:
5bf0d3e61c -s ours
am:
d66d01c85e -s ours
Change-Id: I082401505cbd0d9550602765a0611a20770566f8
Nathan Harold [Thu, 12 Jul 2018 21:04:52 +0000 (14:04 -0700)]
Merge "Remove Duplicate Override for Operator Alphas" am:
24eaa6ab3d am:
f5f908c525
am:
fe1b6deb66
Change-Id: I0f0525480e9d28142cb5ee375f834a21e6121f31
Bill Yi [Thu, 12 Jul 2018 20:57:24 +0000 (13:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours am:
847b7d112e -s ours
am:
5bf0d3e61c -s ours
Change-Id: I1ee3b8540dec46bdd7e9539b469567f498ddd68f
Amy [Wed, 6 Jun 2018 00:31:55 +0000 (17:31 -0700)]
GiveAudioStatusHandler and test.
Test: atest com.android.server.hdmi
Change-Id: I402d3b783783bf9d79f3b7de55fb7a26f6c10be2
(cherry picked from commit
403a500216047e04fa8aebe8b24d4e3d89d28898)
Sudheer Shanka [Thu, 12 Jul 2018 20:48:27 +0000 (20:48 +0000)]
Merge "Track time spent for computing oom_adj."
TreeHugger Robot [Thu, 12 Jul 2018 20:47:34 +0000 (20:47 +0000)]
Merge "Add stub handlers for audio system device."
Winson Chung [Thu, 12 Jul 2018 20:46:44 +0000 (20:46 +0000)]
Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev
Bill Yi [Thu, 12 Jul 2018 20:37:57 +0000 (13:37 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0
am:
d9bd9d1c04
Change-Id: Id7b15870681b4971920a36db92198bb32d92ef51
TreeHugger Robot [Thu, 12 Jul 2018 20:31:25 +0000 (20:31 +0000)]
Merge "Make IAutofillManager fully oneway."
Bill Yi [Thu, 12 Jul 2018 20:27:05 +0000 (13:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours am:
afb05522f1 -s ours
am:
f85971f3a2 -s ours
Change-Id: I0891178936b34370816eb9c15fd4103ecee586cc
Nathan Harold [Thu, 12 Jul 2018 20:26:41 +0000 (13:26 -0700)]
Merge "Remove Duplicate Override for Operator Alphas" am:
24eaa6ab3d
am:
f5f908c525
Change-Id: I9fe744ec118df8e68616d72f2c26db612b2b49a0
Bill Yi [Thu, 12 Jul 2018 20:24:55 +0000 (13:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours
am:
847b7d112e -s ours
Change-Id: I236fce4894fa4dda79e34ed191560598dcd2a4c4
TreeHugger Robot [Thu, 12 Jul 2018 20:24:24 +0000 (20:24 +0000)]
Merge "Remove use of SkRefCnt_SafeAssign."
Bill Yi [Thu, 12 Jul 2018 20:17:45 +0000 (13:17 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856
am:
262d6935a0
Change-Id: Ic9027e92228853ab6dffacf72c0afc3920946d19
Bill Yi [Thu, 12 Jul 2018 20:10:22 +0000 (13:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours
am:
afb05522f1 -s ours
Change-Id: I92e39d42756e8d5d7f517802ddbdc8e539024d88
Bill Yi [Thu, 12 Jul 2018 20:08:42 +0000 (13:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours
am:
bf789ba0d1 -s ours
Change-Id: I157f816f170fc9af6263e552a46612fab2760f63
Bill Yi [Thu, 12 Jul 2018 19:47:58 +0000 (12:47 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev
am:
71bd839856
Change-Id: Ic7c05906f4d2f9fecc9ab93ab90b9869d8b176be
Bill Yi [Thu, 12 Jul 2018 19:45:19 +0000 (12:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
am:
0c31d81cd1 -s ours
Change-Id: I404ba441a96f77be638d89c0c43f950200a94376
Bill Yi [Thu, 12 Jul 2018 19:41:11 +0000 (12:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657
am:
9935787f3b -s ours
Change-Id: I1ef782ee8a7ed8da6baed44c052f1fa3a08c1af4
Nathan Harold [Thu, 12 Jul 2018 19:35:18 +0000 (12:35 -0700)]
Merge "Remove Duplicate Override for Operator Alphas"
am:
24eaa6ab3d
Change-Id: I15004a7df3d922ba50d187769299723e888febae
TreeHugger Robot [Thu, 12 Jul 2018 19:34:40 +0000 (19:34 +0000)]
Merge "Depecrate flags, and try to match them to actions"
TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e
Import translations. DO NOT MERGE
Ben Wagner [Thu, 12 Jul 2018 16:41:28 +0000 (12:41 -0400)]
Remove use of SkRefCnt_SafeAssign.
Update pointer to SkRefCnt fields which require it to sk_sp.
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I4f3eb790ee67c09746708458c4492569b64cc58f
Jordan Liu [Thu, 12 Jul 2018 19:16:41 +0000 (12:16 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read" am:
0beefc0af5 am:
e5c77fc978
am:
4af8f3c3bf
Change-Id: I032f399674847edf7698ad13d5914e33a0df70d1
Neil Fuller [Thu, 12 Jul 2018 19:00:24 +0000 (12:00 -0700)]
[automerger skipped] Merge "Move XML object factory logic to libcore" am:
8176fb99e1 am:
7add22db60
am:
a57acd367c -s ours
Change-Id: I7084ce472a2fce76048b02fe7f0c1672428bd207
Jordan Liu [Thu, 12 Jul 2018 18:56:50 +0000 (11:56 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read" am:
0beefc0af5
am:
e5c77fc978
Change-Id: I42a6e604ff65bbb77d0f23c584722c1ea44038e6
Dan Shi [Tue, 10 Jul 2018 05:18:08 +0000 (22:18 -0700)]
Add tests in gce-presubmit-am.gcl and gce-postsubmit-am.gcl to TEST_MAPPING
Bug:
111302567
Test: local run atest
veried in TH: tests/
a4174ff9-e417-479d-8ca5-
8431d6adeed8
Change-Id: I9ecc5c9c209b9d2728f9f7ed5d298867905555f3
Jack Yu [Thu, 12 Jul 2018 18:49:31 +0000 (11:49 -0700)]
[automerger skipped] Merge "Added documentation for network registration state" am:
c51397b161 -s ours am:
6af5ddcc4a
am:
e0cb240a50
Change-Id: I9de375d4da8c612bfa09c947c652edc1c2c28722
Jordan Liu [Thu, 12 Jul 2018 18:46:32 +0000 (11:46 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read"
am:
0beefc0af5
Change-Id: I1ac69c71c7bdb39a9631da00a8bda89f7c1f0edd
Neil Fuller [Thu, 12 Jul 2018 18:42:14 +0000 (11:42 -0700)]
Merge "Move XML object factory logic to libcore" am:
8176fb99e1
am:
7add22db60
Change-Id: If395891203fae0a8b55f8f58430adc979b758db2
Jack Yu [Thu, 12 Jul 2018 18:35:03 +0000 (11:35 -0700)]
[automerger skipped] Merge "Added documentation for network registration state" am:
c51397b161 -s ours
am:
6af5ddcc4a
Change-Id: I7ea119e9f8d580e18efa56f1cfa3be4c86c18bea
chened [Thu, 12 Jul 2018 18:33:30 +0000 (11:33 -0700)]
Merge "Camera: Use session configuraion when recording tests" into pi-dev am:
26da9f18ed
am:
c6360e5772
Change-Id: I7667526285406451cea841dba22d265163c95354
Neil Fuller [Thu, 12 Jul 2018 18:26:03 +0000 (11:26 -0700)]
Merge "Move XML object factory logic to libcore"
am:
8176fb99e1
Change-Id: Ib0940ecb89eaf11841bbd66cdaf1c5379466496c
Jack Yu [Thu, 12 Jul 2018 18:21:11 +0000 (11:21 -0700)]
[automerger skipped] Merge "Added documentation for network registration state"
am:
c51397b161 -s ours
Change-Id: I33f775c099c949f117badea85fadaa3e5a2eec7a
Donghui Han [Thu, 12 Jul 2018 18:19:07 +0000 (11:19 -0700)]
Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev am:
2fca393cc1
am:
d05d630060
Change-Id: I3947264d88d0c558f8c7fb5ee22160af934e411e
Nathan Harold [Thu, 12 Jul 2018 18:08:05 +0000 (18:08 +0000)]
Merge "Remove Duplicate Override for Operator Alphas"
Wale Ogunwale [Wed, 11 Jul 2018 22:22:01 +0000 (15:22 -0700)]
Acquire service lock in AppTaskImpl.moveToFront()
Oversight from previous refactor in O release done in ag/
2987716
Change-Id: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Merged-In: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Fixes:
111336376
Test: builds
chened [Thu, 12 Jul 2018 17:53:26 +0000 (10:53 -0700)]
Merge "Camera: Use session configuraion when recording tests" into pi-dev
am:
26da9f18ed
Change-Id: I68975212f84e6e31c2dffb002749d2ec735689b5
Sudheer Shanka [Thu, 12 Jul 2018 17:30:38 +0000 (10:30 -0700)]
Track time spent for computing oom_adj.
Fixes:
111396442
Test: manual
Change-Id: I5d6877a149920ba764d7a2c90806ae7e45db5aac
Donghui Han [Thu, 12 Jul 2018 17:47:53 +0000 (10:47 -0700)]
Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev
am:
2fca393cc1
Change-Id: I77b6b8e6d469a9e28478ddd7975f9c065caef20b
Felipe Leme [Mon, 18 Jun 2018 20:56:38 +0000 (13:56 -0700)]
Make IAutofillManager fully oneway.
The critical methods on this interface - like updateSession() - were already
void, so all we had to do were to "onewaywize" the other methods. We could
either refactor them to be truly async, or implement a blocking mechanism that
let them still be sync *and* oneway - because these methods are not in the
critical path, we opted for the latter, which is simpler and less risky.
Fixes:
73536867
Test: mmma -j ./frameworks/base/apct-tests/perftests/autofill/ && \
adb install -r $OUT/data/app/AutofillPerfTests/AutofillPerfTests.apk && \
adb shell am instrument -w -e class android.view.autofill.LoginTest \
com.android.perftests.autofill/android.support.test.runner.AndroidJUnitRunner
Test: CtsAutoFillServiceTestCases
Change-Id: I380430aa2a7805aed6f629afb360566fc5402abb
Jordan Liu [Thu, 12 Jul 2018 17:36:15 +0000 (17:36 +0000)]
Merge "WRITE_APN_SETTINGS is also required to read"
TreeHugger Robot [Thu, 12 Jul 2018 17:26:37 +0000 (17:26 +0000)]
Merge "Camera: Use session configuraion when recording tests" into pi-dev
Amy [Wed, 6 Jun 2018 00:31:55 +0000 (17:31 -0700)]
Add stub handlers for audio system device.
Test: make -j18
Change-Id: I5097baef4a5d1441358642590086fab292eee86e
(cherry picked from commit
e708748068139b7aebaa17dac41fe2f30594daf3)
Donghui Han [Thu, 12 Jul 2018 17:19:36 +0000 (17:19 +0000)]
Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev
TreeHugger Robot [Thu, 12 Jul 2018 16:50:11 +0000 (16:50 +0000)]
Merge "Fixed temporary brightness getting stuck bug."
TreeHugger Robot [Thu, 12 Jul 2018 16:38:03 +0000 (16:38 +0000)]
Merge "Re-evaluate scrim color on keyguard vis event"
TreeHugger Robot [Thu, 12 Jul 2018 16:36:34 +0000 (16:36 +0000)]
Merge "Hide wallpaper when backdrop arrives"
TreeHugger Robot [Thu, 12 Jul 2018 14:51:12 +0000 (14:51 +0000)]
Merge "Use minimumHeight in QS header"
Treehugger Robot [Thu, 12 Jul 2018 13:46:56 +0000 (13:46 +0000)]
Merge "Move XML object factory logic to libcore"
Dan Gittik [Thu, 12 Jul 2018 13:22:08 +0000 (14:22 +0100)]
Fixed temporary brightness getting stuck bug.
When the user would set the brightness to the same value, the
temporary brightness would remain applied, effectively disabling
auto-brightness and confusing the system state.
Test: Drag the slider to an extremity (e.g. maximum), let it go, and
then re-drag the slider to the same place (e.g. place your finger
on the middle of the slider and move it to the maximum again).
run adb shell dumpsys display | grep mAppliedTemporaryBrightness
to check whether temporary brightness is applied; should be false.
Change-Id: Id3a1bff533b1bee9ca760e742dab379eeeb4b14e
Fixes:
111050860
Jorim Jaggi [Thu, 12 Jul 2018 11:55:08 +0000 (13:55 +0200)]
DO NOT MERGE Remove WTF spam
Root cause has been identified, but fix is too risky. Instead, we
remove the WTF for now and readd the fix as well as the WTF
in master.
Note that due to defensive programming, in case we land in the WTF
case, it doesn't cause any real bug.
Test: boots
Bug:
110834518
Change-Id: I0da1e48e420c3fcde0e818b7fe0527da9155a159
TreeHugger Robot [Thu, 12 Jul 2018 11:20:37 +0000 (11:20 +0000)]
Merge "Move XML object factory logic to libcore"
Felka Chang [Thu, 12 Jul 2018 09:40:05 +0000 (09:40 +0000)]
Merge "fix overlay on status bar because of two clock"
Neil Fuller [Thu, 12 Jul 2018 09:06:01 +0000 (02:06 -0700)]
[automerger skipped] Remove unnecessary libcore includes am:
23a97d8d46
am:
0ef27dac21 -s ours
Change-Id: I594bfa59f9ccafa19fa466ffe7a77f8d1407c742
Neil Fuller [Thu, 12 Jul 2018 09:00:02 +0000 (02:00 -0700)]
Remove unnecessary libcore includes
am:
23a97d8d46
Change-Id: Ic13bcf0477fecd609db8224dc8f9298fa94fa7f9
Neil Fuller [Tue, 10 Jul 2018 14:18:58 +0000 (15:18 +0100)]
Remove unnecessary libcore includes
This commit removes includes that don't appear to be needed.
Test: build
Bug:
111055375
Merged-In: Ia660abcf992c4acd8709d217116f895b07d9c61c
Change-Id: Ia660abcf992c4acd8709d217116f895b07d9c61c
(cherry picked from commit
fa956d5d722dd600ed429f02c55e796f9dc2c772)
Neil Fuller [Thu, 12 Jul 2018 07:33:30 +0000 (07:33 +0000)]
Merge "Remove unnecessary libcore includes"
TreeHugger Robot [Thu, 12 Jul 2018 07:01:19 +0000 (07:01 +0000)]
Merge "Settings Frament Migration"
felkachang [Fri, 29 Jun 2018 07:34:28 +0000 (15:34 +0800)]
fix overlay on status bar because of two clock
Although the status bar block user's tap, the user still could
drag the status bar to expland the notification panel.
The root cause is that neither the clock nor the notification icon
inner area doesn't hide when the user drag down the status bar in
landscape condition but portrait does.
The solution is to trigger mStatusBar.recomputeDisableFlags when
the heads up is showing in landscape mode and the expand status is
different. CollapsedStatusBarFragment.adjustDisableFlags should
disable clock showing when the heads up showing.
Change-Id: If7411f5d8eef9cf234b83a463006325ba0156311
Fix:
110808257
Test: atest SystemUITests
felkachang [Wed, 4 Jul 2018 04:51:44 +0000 (12:51 +0800)]
Fix EditText show wrong position when ime show
In landscape and largest density, the area that could show the heads
up notification is smaller than normal density. To handle the heads
up notification should be different with the normal notification in
both of targetScrollForView and getScrollRange because
StackScrollAlgorithm translation heads up notification as
mHeadsUpInset but neither targetScrollForView nor getScrollRange has
have the same consideration.
The solution make the StackScrollAlgorithm to considerate scroll
value to move up the heads up notification.
The getScrollRange need to consider more about the difference
between heads up showing and non-heads up showing. The top padding
and the total content height are the major considerations.
Test: manual test
Test: atest SystemUITests
Change-Id: I46bb960a81f6ab5be4d8e39738e8fb64245dd4eb
Fixes:
110388615
Wale Ogunwale [Thu, 12 Jul 2018 03:30:20 +0000 (03:30 +0000)]
Merge "Acquire service lock in AppTaskImpl.moveToFront()"
TreeHugger Robot [Thu, 12 Jul 2018 02:33:30 +0000 (02:33 +0000)]
Merge "Make sure checking for accessibility pane is consistent"
Jack Yu [Thu, 12 Jul 2018 02:28:32 +0000 (02:28 +0000)]
Merge "Added documentation for network registration state"
Android Build Merger (Role) [Thu, 12 Jul 2018 01:50:59 +0000 (01:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657
Change-Id: I444e7a4567e0319e0a1999ca1a83418b14812d5d
Android Build Merger (Role) [Thu, 12 Jul 2018 01:50:52 +0000 (01:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83
Change-Id: I119e6fba2ffa56ca9a8b24df821025abf4bf9580
Bill Yi [Thu, 12 Jul 2018 01:50:30 +0000 (18:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I989a9b371c1dc0c713b67c0a8cef4f3bdc0c457c
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 12 Jul 2018 01:39:06 +0000 (01:39 +0000)]
Merge "Add stub implementation of HdmiCecLocalDeviceAudioSystem"
tmfang [Wed, 4 Jul 2018 10:51:10 +0000 (18:51 +0800)]
Settings Frament Migration
Migrate all core classes to AndroidX version.
Bug:
110259478
Test: We can't test it now. But we will have an integration test later.
Change-Id: If34908326f6dd713da7e3e28fe63d0ce3f057f5e
Jeff Sharkey [Thu, 12 Jul 2018 01:19:39 +0000 (01:19 +0000)]
Merge "Utility methods useful for working with files."
Nick Chalko [Fri, 25 May 2018 17:29:01 +0000 (10:29 -0700)]
Add stub implementation of HdmiCecLocalDeviceAudioSystem
Bug:
80297499
Change-Id: I02893148f3970d6635d8ccad99de0f3ab6f5f0f9
Test: lunch atom; m; flashall
(cherry picked from commit
9a9fd4eaec0d36b19b416e3dc429a69088134698)
Arun Rathi [Thu, 12 Jul 2018 00:24:29 +0000 (17:24 -0700)]
Merge "Add Channel 50 (area update info) support for LAM market" am:
57df2a333f am:
cdac4d77f6
am:
d4e3f8ff6f
Change-Id: Ifaa7d55a8528201cf7418f3e40571b67e5f3c33a
Android Build Merger (Role) [Wed, 11 Jul 2018 23:43:09 +0000 (23:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
Change-Id: Ib3e6c7f2885ac23d45a68e7e20d981969067eb3b
Android Build Merger (Role) [Wed, 11 Jul 2018 23:43:02 +0000 (23:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e
Change-Id: I37e47c3e87c8e9143731af2b4bf0d92fc4ce7f38
Bill Yi [Wed, 11 Jul 2018 23:42:32 +0000 (16:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9878d930e5aa4e4fe1883f28063e167240bb99b5
Auto-generated-cl: translation import
Arun Rathi [Wed, 11 Jul 2018 23:30:50 +0000 (16:30 -0700)]
Merge "Add Channel 50 (area update info) support for LAM market" am:
57df2a333f
am:
cdac4d77f6
Change-Id: Iacc41524d575e1dd4c179ab81e7fa374ee096e5b
Arun Rathi [Wed, 11 Jul 2018 23:08:33 +0000 (16:08 -0700)]
Merge "Add Channel 50 (area update info) support for LAM market"
am:
57df2a333f
Change-Id: I28ece8be0f12979bd037337c87df1ce8fd05c331
John Reck [Wed, 11 Jul 2018 23:03:35 +0000 (16:03 -0700)]
Merge "Merge "Disable LTO on -eng" am:
1918b39942 am:
af3e763358" into pi-dev-plus-aosp
am:
7ac9ac5605
Change-Id: I7b048d8897006ba3e0772a9c6e60ecfed0cbe2a8
Arthur Ishiguro [Wed, 11 Jul 2018 22:44:51 +0000 (15:44 -0700)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4 am:
77e6e34644 am:
49e97ea1dc am:
c2cfe453f2 am:
cab2fa779e am:
bf8733b162 am:
e9b67d2b22 am:
267b960dab
am:
b9912a254a
Change-Id: Ic85c323a3b706808616e1cf9d3e30a95ca2c37f6
Wale Ogunwale [Wed, 11 Jul 2018 22:22:01 +0000 (15:22 -0700)]
Acquire service lock in AppTaskImpl.moveToFront()
Oversight from previous refactor in O release done in ag/
2987716
Change-Id: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Fixes:
111336376
Test: builds
TreeHugger Robot [Wed, 11 Jul 2018 22:21:38 +0000 (22:21 +0000)]
Merge "Suggest smart actions in ExtServices"
Android Build Merger (Role) [Wed, 11 Jul 2018 22:10:09 +0000 (22:10 +0000)]
Merge "Merge "Disable LTO on -eng" am:
1918b39942 am:
af3e763358" into pi-dev-plus-aosp
John Reck [Wed, 11 Jul 2018 22:09:34 +0000 (15:09 -0700)]
Merge "Disable LTO on -eng" am:
1918b39942
am:
af3e763358
Change-Id: I5146424fc06ad7c62088a0ac6f957e0a02b0ec66
Arthur Ishiguro [Wed, 11 Jul 2018 22:07:23 +0000 (15:07 -0700)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4 am:
77e6e34644 am:
49e97ea1dc am:
c2cfe453f2 am:
cab2fa779e am:
bf8733b162 am:
e9b67d2b22
am:
267b960dab
Change-Id: I78fff5a76a8e1215e3a4235cbe65cc95d0fb8653
Treehugger Robot [Wed, 11 Jul 2018 21:52:01 +0000 (21:52 +0000)]
Merge "Add Channel 50 (area update info) support for LAM market"
John Reck [Wed, 11 Jul 2018 21:48:50 +0000 (14:48 -0700)]
Merge "Disable LTO on -eng"
am:
1918b39942
Change-Id: I925182b722d7bf6b1bb63c298a8ec9e345f0c4ac
Arthur Ishiguro [Wed, 11 Jul 2018 21:40:57 +0000 (14:40 -0700)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4 am:
77e6e34644 am:
49e97ea1dc am:
c2cfe453f2 am:
cab2fa779e am:
bf8733b162
am:
e9b67d2b22
Change-Id: Ia3222d7b97b2d1083404d607738fc15d2646999c
Arthur Ishiguro [Wed, 11 Jul 2018 21:27:45 +0000 (14:27 -0700)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4 am:
77e6e34644 am:
49e97ea1dc am:
c2cfe453f2 am:
cab2fa779e
am:
bf8733b162
Change-Id: I4fe6469031d7ef6fcc6d9b46da4dbc5845ea62d2