Priyank Singh
e44a03dd67
Merge "Adding a level of indirection. Dimens value should live in the framework/base and not the overlay." into qt-dev am: 1bd2e9b5d6
...
am: ec00411262
2019-04-05 15:47:34 -07:00
Joshua Mccloskey
8b4845f913
Merge "Adding debug value to Biometric atoms."
2019-04-05 21:48:08 +00:00
Android Build Merger (Role)
08199d20c7
Merge "Merge "Support profileable application action" into qt-dev am: 7cefe09ec7 am: dca6b7746e"
2019-04-05 20:43:17 +00:00
Chris Craik
6c463d2475
Merge "Support profileable application action" into qt-dev am: 7cefe09ec7
...
am: dca6b7746e
2019-04-05 13:42:25 -07:00
TreeHugger Robot
cce0f72580
Merge "Fix missing call to requestTransparentRegion()"
2019-04-05 20:39:42 +00:00
Chong Zhang
3784243414
Merge "make libmedia_jni_utils depends on libgui" into qt-dev am: d937a7916f
...
am: 8b25efda04
2019-04-05 13:36:11 -07:00
David Su
7b15d7daf8
Merge "wifi.proto: Add link probe event to StaEvent" into qt-dev am: a3ef6c2d1f
...
am: b7b706d460
2019-04-05 13:29:49 -07:00
Tim Murray
359cb3ed1f
Merge "zygote: initialize ashmem early" into qt-dev am: ce3a694103
...
am: e21b748b2e
2019-04-05 13:22:38 -07:00
Chavi Weingarten
91ae702142
Merge "Only switch task focus to window's task that was tapped outside current focus" into qt-dev am: da8ecc5154
...
am: bb75959f52
2019-04-05 13:17:24 -07:00
Leon Scroggins
dc2557334a
Merge "Remove redundant calls to invalidateParentIfNeeded"
2019-04-05 20:04:02 +00:00
Evan Laird
f9e6ed2996
Merge "Re-enable NonPhoneDependencyTest"
2019-04-05 20:01:36 +00:00
joshmccloskey
7d7cad2289
Adding debug value to Biometric atoms.
...
Bug: 129438832
Test: It builds
Change-Id: I86e3a39f0bd1ac0986a350611657a34b512e0aef
2019-04-05 19:44:40 +00:00
Priyank Singh
ec00411262
Merge "Adding a level of indirection. Dimens value should live in the framework/base and not the overlay." into qt-dev
...
am: 1bd2e9b5d6
2019-04-05 12:09:35 -07:00
Android Build Merger (Role)
4ca4678c76
Merge "Merge "EGLAttrib requires special handling in JNI" into qt-dev am: 44e30f9a0d am: 1b53374b88"
2019-04-05 18:55:59 +00:00
Courtney Goeltzenleuchter
8b7298c890
Merge "EGLAttrib requires special handling in JNI" into qt-dev am: 44e30f9a0d
...
am: 1b53374b88
2019-04-05 11:55:02 -07:00
Chris Craik
dca6b7746e
Merge "Support profileable application action" into qt-dev
...
am: 7cefe09ec7
2019-04-05 11:50:55 -07:00
Android Build Merger (Role)
90231826ed
Merge changes from topic "am-210e5cc30e434357bd552419de9c31d2"
...
* changes:
Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev am: 960c4f06aed91287e09af83192de79162ac3ad85
2019-04-05 18:49:12 +00:00
Eric Laurent
03bdec953b
Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev am: 960c4f06ae
...
am: d91287e09a
2019-04-05 11:48:08 -07:00
Chong Zhang
8b25efda04
Merge "make libmedia_jni_utils depends on libgui" into qt-dev
...
am: d937a7916f
2019-04-05 11:42:37 -07:00
Eric Laurent
9ac445935b
Merge "Revert "Revert "Mute haptic channels by default.""" into qt-dev am: f83192de79
...
am: 162ac3ad85
2019-04-05 11:40:58 -07:00
William Hester
eb6908df5e
Merge "Disable lock screen and enable location in THM"
2019-04-05 18:39:02 +00:00
William Hester
fd0230bffc
Disable lock screen and enable location in THM
...
In Test Harness Mode, the lock screen will be disabled so that tests can
start immediately, and location will be enabled (for use with CTS).
Bug: 80137798
Test: make, adb shell cmd testharness enable
Change-Id: I08f4c06865013d2cbdf7e95cf12fdf469c30b9e7
2019-04-05 18:38:07 +00:00
David Su
b7b706d460
Merge "wifi.proto: Add link probe event to StaEvent" into qt-dev
...
am: a3ef6c2d1f
2019-04-05 11:35:55 -07:00
Tony Mak
67afc2cd93
Merge "Merge "Flag to configure model parameters" into qt-dev am: 3b74731f4e" into qt-dev-plus-aosp
...
am: 0ca098c3ab
2019-04-05 11:35:42 -07:00
Tim Murray
e21b748b2e
Merge "zygote: initialize ashmem early" into qt-dev
...
am: ce3a694103
2019-04-05 11:29:01 -07:00
Chavi Weingarten
bb75959f52
Merge "Only switch task focus to window's task that was tapped outside current focus" into qt-dev
...
am: da8ecc5154
2019-04-05 11:23:48 -07:00
Steven Moreland
0a315d1216
[automerger skipped] Merge "Revert "ApplicationLoaders: hard failures & tests"" into qt-dev-plus-aosp
...
am: 9f256f617f21a862cc5c
2019-04-05 11:21:24 -07:00
Mark Renouf
838e25e72e
Merge "Set system gesture exclusion rects for Bubbles" into qt-dev am: 0f6b976405
...
am: 0b0b2787f7
2019-04-05 10:55:16 -07:00
Courtney Goeltzenleuchter
1b53374b88
Merge "EGLAttrib requires special handling in JNI" into qt-dev
...
am: 44e30f9a0d
2019-04-05 10:50:01 -07:00
Evan Laird
7b88ee46aa
Re-enable NonPhoneDependencyTest
...
Hopefully it doesn't flake?
Bug: 118607736
Test: atest SystemUITests
Change-Id: I16c9392ef6100c1b2376a466dd2ac682580a3481
2019-04-05 13:45:21 -04:00
TreeHugger Robot
1bd2e9b5d6
Merge "Adding a level of indirection. Dimens value should live in the framework/base and not the overlay." into qt-dev
2019-04-05 17:44:25 +00:00
Eric Laurent
d91287e09a
Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev
...
am: 960c4f06ae
2019-04-05 10:38:47 -07:00
Eric Laurent
162ac3ad85
Merge "Revert "Revert "Mute haptic channels by default.""" into qt-dev
...
am: f83192de79
2019-04-05 10:28:50 -07:00
TreeHugger Robot
7cefe09ec7
Merge "Support profileable application action" into qt-dev
2019-04-05 17:26:53 +00:00
TreeHugger Robot
afaa528e3c
Merge "Add ContentSuggestionsService call counters"
2019-04-05 17:21:12 +00:00
Android Build Merger (Role)
fe2b320fc4
Merge "Merge "Catch ArrayIndexOutOfBoundsException in StateMachine.toString()" into qt-dev am: 7b0c0c7694 am: c75cc8e5e2"
2019-04-05 17:20:02 +00:00
Quang Luong
5901e436bd
Merge "Catch ArrayIndexOutOfBoundsException in StateMachine.toString()" into qt-dev am: 7b0c0c7694
...
am: c75cc8e5e2
2019-04-05 10:19:38 -07:00
Christian Wailes
799eead4a9
Merge "Enabled the USAP Pool by default."
2019-04-05 17:18:50 +00:00
Chong Zhang
d937a7916f
Merge "make libmedia_jni_utils depends on libgui" into qt-dev
2019-04-05 17:18:04 +00:00
Leon Scroggins III
b199568a4a
Remove redundant calls to invalidateParentIfNeeded
...
Test: CtsViewTestCases
setLeft, setTop, setRight, and setBottom called it once, and then
potentially called it again. The second call is unnecessary.
Change-Id: If92d4b786d4680024614042cd8905ae56ea1c9e9
2019-04-05 13:16:31 -04:00
David Su
a3ef6c2d1f
Merge "wifi.proto: Add link probe event to StaEvent" into qt-dev
2019-04-05 17:15:01 +00:00
Android Build Merger (Role)
4a9d758b9d
Merge "Merge "Merge "Fix isExternalStorageSandboxed() bug." into qt-dev am: 10a222bf3c" into qt-dev-plus-aosp am: ffe47c199f"
2019-04-05 17:09:26 +00:00
Jeff Sharkey
5faf2feb35
Merge "Merge "Fix isExternalStorageSandboxed() bug." into qt-dev am: 10a222bf3c" into qt-dev-plus-aosp
...
am: ffe47c199f
2019-04-05 10:07:50 -07:00
TreeHugger Robot
ce3a694103
Merge "zygote: initialize ashmem early" into qt-dev
2019-04-05 17:06:51 +00:00
Tarandeep Singh
fa95edaf0f
Merge "Fix InsetsSourceConsumer visibility"
2019-04-05 17:02:59 +00:00
Android Build Merger (Role)
0ca098c3ab
Merge "Merge "Flag to configure model parameters" into qt-dev am: 3b74731f4e" into qt-dev-plus-aosp
2019-04-05 16:58:09 +00:00
Tony Mak
624c594fab
Merge "Flag to configure model parameters" into qt-dev
...
am: 3b74731f4e
2019-04-05 09:57:39 -07:00
Steven Moreland
9f256f617f
Merge "Revert "ApplicationLoaders: hard failures & tests"" into qt-dev-plus-aosp
2019-04-05 16:55:59 +00:00
Steven Moreland
4857d1bc55
Revert "ApplicationLoaders: hard failures & tests"
...
This reverts commit fd1dad339b
2019-04-05 16:54:08 +00:00
Mark Renouf
0b0b2787f7
Merge "Set system gesture exclusion rects for Bubbles" into qt-dev
...
am: 0f6b976405
2019-04-05 09:49:24 -07:00
