Matt Pape
7a3a9281ee
Merge "Update GenerationRegistry to account for config table."
2019-07-15 21:27:57 +00:00
Kweku Adams
007d85d50d
Merge "Fix Progressive Battery Saver's Data Saver toggle."
2019-07-15 21:26:53 +00:00
Kweku Adams
25fa3a7043
Fix Progressive Battery Saver's Data Saver toggle.
...
Make sure that Data Saver can be enabled properly with Progressive
Battery Saver. Before this change, NetworkPolicyManagerService would
look at the global battery saver enabled flag, which meant that Data
Saver would only be enabled if BatterySaverPolicy.advertiseIsEnabled
and BatterySaverPolicy.enableDataSaver were both set to true. Now it
only requires the latter.
Bug: 119261320
Test: atest com.android.server.net.NetworkPolicyManagerServiceTest
Change-Id: I0f538129c4ed6a586316426a35e767d2d6b6ba1d
2019-07-15 14:23:52 -07:00
Elliott Hughes
c8e8eb13af
Merge "Remove perfprofd support."
2019-07-15 20:06:16 +00:00
Andreas Gampe
18bd9606b9
Merge "Framework: Improve binder Error logging" am: f3c8624834 am: a671dcd061 am: b206ac6f07
...
am: 95f430d9b4
2019-07-15 12:42:00 -07:00
Andreas Gampe
95f430d9b4
Merge "Framework: Improve binder Error logging" am: f3c8624834 am: a671dcd061
...
am: b206ac6f07
2019-07-15 12:31:55 -07:00
Andreas Gampe
b206ac6f07
Merge "Framework: Improve binder Error logging" am: f3c8624834
...
am: a671dcd061
2019-07-15 12:13:59 -07:00
Andreas Gampe
a671dcd061
Merge "Framework: Improve binder Error logging"
...
am: f3c8624834
2019-07-15 11:54:26 -07:00
Treehugger Robot
f3c8624834
Merge "Framework: Improve binder Error logging"
2019-07-15 18:28:27 +00:00
TreeHugger Robot
ba7fb6a5f6
Merge "Improve logic when to use filtering in readback and TextureView"
2019-07-15 18:18:00 +00:00
TreeHugger Robot
cf804144c7
Merge "Add a broadcast for automatic zen rule status"
2019-07-15 17:11:06 +00:00
TreeHugger Robot
a3cd95f4a7
Merge changes I54dda008,Id06cb476
...
* changes:
Fix exception message
Fix JNI usage bugs.
2019-07-15 16:55:10 +00:00
John Reck
03bd07aa0d
Fix exception message
...
buffer->flexFormat is only used if usingRGBAToJpegOverride is true,
which appears to be the uncommon case. As such the unsupported
format exception should be using the writerFormat instead, which is
what's actually being looked up typically.
Bug: 137323248
Test: snippet in bug & compare what format is actually switched on
with what the exception message claims is unsupported.
Change-Id: I54dda0088fd722126e80e38eebe5da2f26378e1d
2019-07-15 09:49:37 -07:00
John Reck
dcd4c584a1
Fix JNI usage bugs.
...
Avoids calling other JNI stuff with a pending exception by
ensuring methods return after jniThrowException.
Bug: 137323248
Test: app in bug doesn't throw JNI DETECTED ERROR IN APPLICATION: JNI NewDirectByteBuffer called with pending exception java.lang.UnsupportedOperationException: Pixel format: 0x1 is unsupported
2
Change-Id: Id06cb476a02c4180881772708e3bb58511efe573
2019-07-15 09:49:32 -07:00
TreeHugger Robot
afdc2c7100
Merge "Refined the logic to detect the location of DisplayCutout."
2019-07-15 16:42:53 +00:00
Nikita Ioffe
1abe575e37
Merge "Populate error message in case APK part of staged install fails"
2019-07-15 16:30:32 +00:00
Eric Laurent
021598cbe7
Merge "audioservice: fix hasMediaDynamicPolicy() for loopback and render policies" into qt-r1-dev am: aa8b8ecec2
...
am: f6b5439737
2019-07-15 09:11:26 -07:00
TreeHugger Robot
3344bfcb84
Merge "Fix uninitialized variable."
2019-07-15 15:51:04 +00:00
Eric Laurent
f6b5439737
Merge "audioservice: fix hasMediaDynamicPolicy() for loopback and render policies" into qt-r1-dev
...
am: aa8b8ecec2
2019-07-15 08:43:15 -07:00
Eric Laurent
aa8b8ecec2
Merge "audioservice: fix hasMediaDynamicPolicy() for loopback and render policies" into qt-r1-dev
2019-07-15 15:18:46 +00:00
Nathaniel Nifong
8f101b8303
Merge "Resolve drawable when playing back DisplayListData in the RenderThread."
2019-07-15 14:04:06 +00:00
Bill Yi
8e3a599e28
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: d5e7e0753c -s ours
...
am: bd19b3999a
2019-07-15 06:45:58 -07:00
Issei Suzuki
6b5f5e97e8
Refined the logic to detect the location of DisplayCutout.
...
Bug: 117199965
Test: atest DisplayCutoutTest
Change-Id: I943922ff6e2866c783b88ce3b2c9bca494d688d7
2019-07-15 15:44:01 +02:00
Bill Yi
bd19b3999a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: d5e7e0753c
2019-07-15 06:38:13 -07:00
Bill Yi
d5e7e0753c
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-15 13:18:50 +00:00
Nikita Ioffe
c2b87a9c1d
Populate error message in case APK part of staged install fails
...
Bug: 136548037
Test: atest CtsStagedInstallHostTestCases
Change-Id: I3fa3dfdf9f920f870f07d55782944043e1afbe2a
2019-07-15 13:28:11 +01:00
Bill Yi
d32cc0a359
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1f6fbcdef3 -s ours am: 2264e1ce5e -s ours
...
am: 10eba2aef3
2019-07-15 03:19:19 -07:00
Bill Yi
5ebc5f514d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1f6fbcdef3 -s ours am: 84d6625f9b -s ours
...
am: de91986395
2019-07-15 03:15:57 -07:00
Android Build Merger (Role)
10eba2aef3
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1f6fbcdef3 -s ours am: 2264e1ce5e -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-15 10:05:23 +00:00
Bill Yi
3f2ea655f6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1f6fbcdef3 -s ours
...
am: 2264e1ce5e
2019-07-15 03:04:12 -07:00
Bill Yi
de91986395
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1f6fbcdef3 -s ours
...
am: 84d6625f9b
2019-07-15 03:04:07 -07:00
Bill Yi
2264e1ce5e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 1f6fbcdef3
2019-07-15 02:52:51 -07:00
Bill Yi
84d6625f9b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 1f6fbcdef3
2019-07-15 02:51:55 -07:00
Chandan Nath
3926904406
Merge "replace "android" by PLATFORM_PACKAGE_NAME"
2019-07-15 09:44:48 +00:00
Patrick Baumann
c86ce9bbfc
[automerger skipped] Merge "Call ActivityManagerService.enterSafeMode" am: 97fc7d6bf6 -s ours am: df024fdffc -s ours am: cf9af32624 -s ours
...
am: 16accb02de876a733e71
2019-07-15 02:33:57 -07:00
TreeHugger Robot
1f6fbcdef3
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-07-15 09:29:34 +00:00
Patrick Baumann
16accb02de
[automerger skipped] Merge "Call ActivityManagerService.enterSafeMode" am: 97fc7d6bf6 -s ours am: df024fdffc -s ours
...
am: cf9af32624876a733e71
2019-07-15 02:21:50 -07:00
Patrick Baumann
cf9af32624
[automerger skipped] Merge "Call ActivityManagerService.enterSafeMode" am: 97fc7d6bf6 -s ours
...
am: df024fdffc876a733e71
2019-07-15 02:09:47 -07:00
Patrick Baumann
df024fdffc
[automerger skipped] Merge "Call ActivityManagerService.enterSafeMode"
...
am: 97fc7d6bf6876a733e71
2019-07-15 01:58:32 -07:00
Treehugger Robot
97fc7d6bf6
Merge "Call ActivityManagerService.enterSafeMode"
2019-07-15 08:39:55 +00:00
Bill Yi
e372602ea6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 2c14f3f98e -s ours
...
am: d068053832
2019-07-14 23:30:01 -07:00
Bill Yi
d068053832
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 2c14f3f98e
2019-07-14 23:20:10 -07:00
Bill Yi
2c14f3f98e
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-15 05:49:55 +00:00
Bill Yi
f19e9123fa
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I43773e15dc0c3d572b791e1ee7aae6353b918f5d
2019-07-14 22:13:49 -07:00
Bill Yi
d0097c6e02
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c26bc89520 -s ours am: 3c3317af36 -s ours
...
am: 97916f9e67
2019-07-14 22:00:30 -07:00
Bill Yi
a59e4120e1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c26bc89520 -s ours am: c67fc520d3 -s ours
...
am: 0de0845da9
2019-07-14 21:54:56 -07:00
Android Build Merger (Role)
97916f9e67
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c26bc89520 -s ours am: 3c3317af36 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-15 04:47:45 +00:00
Bill Yi
a333d032d3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: cba599adea -s ours
...
am: 0733b63531
2019-07-14 21:46:12 -07:00
Bill Yi
0de0845da9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c26bc89520 -s ours
...
am: c67fc520d3
2019-07-14 21:46:11 -07:00
Bill Yi
2330b87b7d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c26bc89520 -s ours
...
am: 3c3317af36
2019-07-14 21:46:09 -07:00
