Chong Zhang
435e59d934
Add BitmapParams option to getFrameAtTime/getScaledFrameAtTime
...
Add versions of these two methods that accepts BitmapParams.
Does not change spec or behavior of existing getFrameAtTime/
getScaledFrameAtTime.
bug: 135718180
bug: 138114267
test: CTS MediaMetadataRetrieverTest; manual testing with
thumbnails saved to storage and examine the outputs.
Change-Id: I75e96dde072c94ac950f0be637cdd096e7543f10
2019-10-08 19:50:17 +00:00
Paul Mclean
843c2951fc
Merge "Adding additional prompt to UsbPermissionsDialg for audio devices."
2019-10-03 19:33:39 +00:00
TreeHugger Robot
2998a810e6
Merge "Sync app ops for all runtime permissions in PermissionPolicyService."
2019-10-03 19:17:23 +00:00
TreeHugger Robot
5422be2fc2
Merge "Sync foreground/background and restricted permission app op together."
2019-10-03 19:16:29 +00:00
Selim Cinek
327243836c
Merge "Dismissed keyguard gone runnables when aborting"
2019-10-03 18:35:53 +00:00
Josh Gao
30641f56c6
Merge "zygote: respond and wait for reply to --boot-completed." am: d34e18c036 am: 15f8fb42d6 am: 332a53756d
...
am: cca303ecd9
Change-Id: Iaf3ab6f8baa3cf1e57b546fc9d00b428ad2a6811
2019-10-03 11:18:38 -07:00
Hui Yu
ed6096a2d2
Merge "Fix the unit test UsageStatsTest."
2019-10-03 18:15:31 +00:00
Chen Xu
fac787d7f2
Merge "telephony annotations part 2"
2019-10-03 18:15:17 +00:00
Josh Gao
cca303ecd9
Merge "zygote: respond and wait for reply to --boot-completed." am: d34e18c036 am: 15f8fb42d6
...
am: 332a53756d
Change-Id: If284835a381f6f7c300c62edc59d1cf9743ac815
2019-10-03 11:11:44 -07:00
Josh Gao
332a53756d
Merge "zygote: respond and wait for reply to --boot-completed." am: d34e18c036
...
am: 15f8fb42d6
Change-Id: I57ba0d7b301ac4652b3df54672c91dedfe1bb16c
2019-10-03 11:05:21 -07:00
Josh Gao
15f8fb42d6
Merge "zygote: respond and wait for reply to --boot-completed."
...
am: d34e18c036
Change-Id: I47819fa73d07ecc3507b03ef446f606407830b29
2019-10-03 10:58:24 -07:00
Paul McLean
d336453217
Adding additional prompt to UsbPermissionsDialg for audio devices.
...
To support, adding members to UsbDevice to mark devices as having audio
playback and audio capture capabilities.
Bug: 136080195
Test: Run "UsbAccess" test bed. Connect audio and non-audio USB devices
and see the additional prompt shown/not-shown.
Change-Id: Ie7c614d9ed30a163c350b18a54b8a9115698779d
2019-10-03 11:54:05 -06:00
TreeHugger Robot
16660951c8
Merge "Added option to pre-create user templates to optimize first user creation time."
2019-10-03 17:44:02 +00:00
Treehugger Robot
d34e18c036
Merge "zygote: respond and wait for reply to --boot-completed."
2019-10-03 17:43:22 +00:00
Dmitry Shmidt
38880c22ac
Merge "AudioService: Fix Mic Mute restriction processing" am: 94ec459834 am: af89aaa6b8 am: eefa1c4119
...
am: a38617f047
Change-Id: Ib2d045a4cb135ef67d4d8fc3dd42891023d3f4d1
2019-10-03 10:37:27 -07:00
Dmitry Shmidt
a38617f047
Merge "AudioService: Fix Mic Mute restriction processing" am: 94ec459834 am: af89aaa6b8
...
am: eefa1c4119
Change-Id: I02dd65ebe0cec5f5532cb3f3140d4bfc33b231bd
2019-10-03 10:30:20 -07:00
Bill Yi
48b70b2dff
[automerger skipped] Import translations. DO NOT MERGE am: 678feaf43a -s ours
...
am: 05ab24825c -s ours
am skip reason: subject contains skip directive
Change-Id: I9155921f2e77628f6726fd46ccb0d58570b231b0
2019-10-03 10:24:16 -07:00
Dmitry Shmidt
eefa1c4119
Merge "AudioService: Fix Mic Mute restriction processing" am: 94ec459834
...
am: af89aaa6b8
Change-Id: I9c886b41cc738cc05fe66c17599b9d3abd4f791c
2019-10-03 10:23:25 -07:00
Jack Yu
4358ca81ed
Merge "Added read phone state permission for getNetworkCountryIso"
2019-10-03 17:22:59 +00:00
Josh Gao
273613653f
zygote: respond and wait for reply to --boot-completed.
...
The zygote handles requests by polling on its sockets, and then handling
one request for each active socket. However, it does so by reading from
a socket via a BufferedReader, which means that if multiple requests are
written into the socket before the zygote gets a chance to read them,
the zygote reads multiple requests into its BufferedReader, it handles
one request, and then never responds to the request that's buffered,
leaving its client stuck waiting for a response that will never happen.
For most requests, this can't happen, because the client will wait for a
response to be sent from the zygote before sending another request, but
this isn't true for --boot-completed until this patch.
Bug: http://b/141767463
Test: forrest runs of apct/text/text_native_test-cloud-tf
Change-Id: I8b7a80abfd9443d98f8cf5aedb7669b82c0cb84a
2019-10-03 17:18:04 +00:00
Dmitry Shmidt
af89aaa6b8
Merge "AudioService: Fix Mic Mute restriction processing"
...
am: 94ec459834
Change-Id: I0fc4a58eb69957f5dae7235edbbd9e6750f27ded
2019-10-03 10:11:09 -07:00
Bill Yi
05ab24825c
[automerger skipped] Import translations. DO NOT MERGE
...
am: 678feaf43a -s ours
am skip reason: subject contains skip directive
Change-Id: Idee6f9b363c8d294235057fe94e5a52c5b65ad5c
2019-10-03 10:09:55 -07:00
Ruslan Tkhakokhov
a3b3988934
Merge changes Ifd189613,Id603dabc,Id9cd0a57
...
* changes:
Add integration test for encrypted KV B&R
Import EncryptedKvRestoreTask
Import EncryptedKvBackupTask
2019-10-03 16:54:29 +00:00
Chavi Weingarten
6b44087b1a
Merge "Added API to mirror display and added sample app."
2019-10-03 16:45:06 +00:00
Treehugger Robot
94ec459834
Merge "AudioService: Fix Mic Mute restriction processing"
2019-10-03 16:39:11 +00:00
TreeHugger Robot
7f898bedec
Merge "Fix FGS lifetime extender overzealousness"
2019-10-03 16:34:32 +00:00
TreeHugger Robot
5237275f5d
Merge "Use stable frame to position freeform windows."
2019-10-03 16:28:24 +00:00
Riddle Hsu
3203a51544
Merge "Clear fake settings provider after the last test"
2019-10-03 15:52:21 +00:00
Fabian Kozynski
0cdb7e9570
Merge "Added secondary label to flashlight"
2019-10-03 15:36:51 +00:00
Adrian Roos
fafb6cf312
Merge "ProtoLog: Better behavior when parsing fails"
2019-10-03 15:21:18 +00:00
Dave Mankoff
13e940c8df
Merge "Revert "Remove many (most) of the calls to Dependency.get() from StatusBar.""
2019-10-03 15:19:20 +00:00
Nicolas Geoffray
4248453665
[automerger skipped] Merge "Adjust and update dumpsys meminfo output." am: 165050810b am: c2f5e33525 am: 9409ec02a6
...
am: 62806139df -s ours
am skip reason: change_id Ie0e7d6b938b6ee81c01191d6830f1196fa2121c1 with SHA1 08fcd7588c is in history
Change-Id: I8f2735c0723769d7ee5bb1239cdc0c5f16bf4e70
2019-10-03 07:58:34 -07:00
Nicolas Geoffray
62806139df
Merge "Adjust and update dumpsys meminfo output." am: 165050810b am: c2f5e33525
...
am: 9409ec02a6
Change-Id: I506c914212ee2e2d366c2469a7aecf3d9528b78a
2019-10-03 07:52:06 -07:00
Nicolas Geoffray
9409ec02a6
Merge "Adjust and update dumpsys meminfo output." am: 165050810b
...
am: c2f5e33525
Change-Id: Ife6a6ffc348f3c0253b843fbd3833727ef0c3e22
2019-10-03 07:40:34 -07:00
Nicolas Geoffray
c2f5e33525
Merge "Adjust and update dumpsys meminfo output."
...
am: 165050810b
Change-Id: I9c4068fcccedeaf00e2c3d52b8e8f75a2ef033f5
2019-10-03 07:26:57 -07:00
Hugo Benichi
6835125661
Merge "WiFi: Remove deprecated methods"
2019-10-03 14:12:35 +00:00
Nicolas Geoffray
165050810b
Merge "Adjust and update dumpsys meminfo output."
2019-10-03 14:12:25 +00:00
Riddle Hsu
6b38e9ee4d
Merge "Wait for system decor windows on all displays during boot"
2019-10-03 14:05:57 +00:00
Riddle Hsu
25e8b7fcca
Clear fake settings provider after the last test
...
The SettingsProvider may keep the testing values in cache
that may affect other tests.
Bug: 142046583
Test: atest DisplayRotationTests
Change-Id: Iebc77bcac9a2e48b80209fd1e8f559bac483fb3d
2019-10-03 21:41:00 +08:00
Riddle Hsu
87dfbb36b3
Merge "Fix startActivities may put activity in new task unexpectedly"
2019-10-03 11:21:32 +00:00
Taran Singh
c0263d94a1
Merge "Add showInsets method in IWindow"
2019-10-03 11:10:02 +00:00
Nicolas Geoffray
0567cd4c7b
Adjust and update dumpsys meminfo output.
...
Adjust for JIT zygote.
Test: dumpsys meminfo
Bug: 119800099
(cherry picked from commit 08fcd7588c )
Change-Id: I84e0d41619558ff3528d7ac8670b1fac04afd34e
Merged-In: Ie0e7d6b938b6ee81c01191d6830f1196fa2121c1
2019-10-03 12:09:50 +01:00
Nicolas Geoffray
0cb92ada28
Merge "Adjust and update dumpsys meminfo output."
2019-10-03 11:05:08 +00:00
Stanislav Zholnin
db5f78edd5
Merge "Fix the bug where AppOps information was saved multiple times in StatsCompanionService pullAppOps method which was overflowing Binder and prevented any log collection from Device"
2019-10-03 10:33:21 +00:00
Riddle Hsu
b2297ad376
Wait for system decor windows on all displays during boot
...
To prevent from showing empty content on some displays temporarily,
wait for displays which support system decorations that have the
expected window types to be drawn.
Also correct the conditions for waiting:
- isVisibleLw and !isDrawnLw are contradicted because they both
check mHasSurface.
- TYPE_APPLICATION must belong to an activity so it is more
reasonable to check BASE_APPLICATION.
Bug: 117597389
Test: atest DisplayContentTests \
#testShouldWaitForSystemDecorWindowsOnBoot_OnSecondaryDisplay
Test: manual enable "Simulate secondary displays" in dev options.
Reboot and check no "BOOT TIMEOUT" in log.
Change-Id: Ie0890cd006da74f290ecc6cbcf1064a0b26de574
2019-10-03 18:24:20 +08:00
Anna Trostanetski
32b5ded82a
Merge "Kill the app once a compat change override is changed." am: 9ff2a6a098 am: 0f2b207397 am: b8eac07194
...
am: a22d2ff7e9
Change-Id: I47b693448da20cc6439c3d83d736258b84860ce1
2019-10-03 03:06:01 -07:00
Anna Trostanetski
a22d2ff7e9
Merge "Kill the app once a compat change override is changed." am: 9ff2a6a098 am: 0f2b207397
...
am: b8eac07194
Change-Id: If15e85a9b97cd8143d19c5dc0c2abaa435b795d1
2019-10-03 02:53:46 -07:00
Anna Trostanetski
b8eac07194
Merge "Kill the app once a compat change override is changed." am: 9ff2a6a098
...
am: 0f2b207397
Change-Id: If92301128dc1cb31ee6b0e8fdf7b2b05c75c9ade
2019-10-03 02:47:35 -07:00
Anna Trostanetski
0f2b207397
Merge "Kill the app once a compat change override is changed."
...
am: 9ff2a6a098
Change-Id: I56fe3d995c7c006ee1450d3bfd372f41ccc0601f
2019-10-03 02:35:32 -07:00
Nicolas Geoffray
08fcd7588c
Adjust and update dumpsys meminfo output.
...
Adjust for JIT zygote.
Test: dumpsys meminfo
Bug: 119800099
Change-Id: Ie0e7d6b938b6ee81c01191d6830f1196fa2121c1
2019-10-03 10:25:23 +01:00