Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
707,971 Commits 3 Branches 0 Tags
92aa9daa10ba767cccead3b875d1251dcf2a2a6b
Commit Graph

9690 Commits

Author SHA1 Message Date
Brian Carlstrom
557e910ff3 Merge "Remove spammy convertToModernFd log" into sc-dev am: eac1d5a41c am: 58b019611c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15472605

Change-Id: I798872f6aa9b59e39c024ce7a87d62082d0e9da6
 2021-08-08 21:10:12 +00:00
Zim
28df0ce32e Remove spammy convertToModernFd log 
It is a common source of confusion that something went wrong while
triaging bugs.

Bug: 195587219
Test: m
Change-Id: Ieca96a2774f08367b05147b49fcea56dd4f2bfda
 2021-08-06 23:35:32 +00:00
Kweku Adams
0ba8fca9e6 Merge "Open up PM.isLightDeviceIdleMode()." 2021-08-06 00:14:48 +00:00
Tom Cherry
5c574f4e3d Merge "DropBoxManager: use BufferedInputStream when using GZIPInputStream" am: 92889d10fe am: afeee6a12b am: 506bf91d21 am: ea6d3dc079 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786608

Change-Id: I6cbf51683bf7a7329f636bb77476f942ca211c40
 2021-08-05 22:56:28 +00:00
Tom Cherry
ea6d3dc079 Merge "DropBoxManager: use BufferedInputStream when using GZIPInputStream" am: 92889d10fe am: afeee6a12b am: 506bf91d21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786608

Change-Id: I64c788061fb707b4e4b0266764e4a3da779fdc0e
 2021-08-05 22:39:38 +00:00
Tom Cherry
506bf91d21 Merge "DropBoxManager: use BufferedInputStream when using GZIPInputStream" am: 92889d10fe am: afeee6a12b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786608

Change-Id: I23ff5312e8e3f42415b744fbd9184d5e42646a3c
 2021-08-05 22:24:21 +00:00
Tom Cherry
afeee6a12b Merge "DropBoxManager: use BufferedInputStream when using GZIPInputStream" am: 92889d10fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786608

Change-Id: Ie10a838553bb3bf235321bc255713b20bf932aeb
 2021-08-05 22:10:16 +00:00
Tom Cherry
92889d10fe Merge "DropBoxManager: use BufferedInputStream when using GZIPInputStream" 2021-08-05 21:56:02 +00:00
Tom Cherry
f2473cc12e DropBoxManager: use BufferedInputStream when using GZIPInputStream 
GZIPInputStream has a bug (b/195554062) where it uses unbuffered IO
when reading the gzip header.  This triggers the UnbufferedIoViolation
strict mode violation for apps that target API level 28+.

Independently of fixing GZIPInputStream, DropBoxManager can use
BufferedInputStream to take a proactive step against this and future
bugs.

Bug: 195554712
Test: Successfully read gzip dropbox entries from API level 28+ app.
Change-Id: Id539efcb366b3e3d53513a098975b25866ed16ff
 2021-08-04 11:32:30 -07:00
Nate Myren
f8dd173528 Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 am: 17e6177ea9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412

Change-Id: I5081e4f0f78783192f553b74936a15755895e045
 2021-08-03 15:52:58 +00:00
Nate Myren
dcc8041ac2 Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 am: f685a342c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412

Change-Id: I2561613cf775cd7107bba4011a9362c3d9b88cd9
 2021-08-03 15:49:39 +00:00
Nate Myren
f685a342c8 Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412

Change-Id: I362a049cc0e3a255796dc3481cbb153c734da76d
 2021-08-03 15:33:04 +00:00
Nate Myren
50ff5ac8b8 Merge "Revert sync app op chain changes" into sc-dev 2021-08-03 15:16:35 +00:00
Nate Myren
86c337659a Revert sync app op chain changes 
These changes cause some noted app ops to be swallowed due to one-way
app ops.

Fixes: 187721493
Test: atest AppOpsLoggingTest
Change-Id: I3b761b65b2e06138fc1d130bf80587f8885bb1d5
 2021-08-02 12:50:44 -07:00
Kweku Adams
25650826d0 Open up PM.isLightDeviceIdleMode(). 
Bug: 159413914
Bug: 170611680
Test: atest DeviceIdleTest
Test: atest FrameworksMockingServicesTests:DeviceIdleControllerTest
Change-Id: Ie4f4148350fde8a8372433271bf00f8e1b804d52
 2021-07-30 11:15:20 -07:00
Li Li
69d46fa9b7 Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75 am: 57240b0a67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534

Change-Id: I8605df085ec636ea1dba1096076bee5c1d6dd4f4
 2021-07-30 17:07:55 +00:00
Li Li
d7306136e8 Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75 am: d2aeb490a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534

Change-Id: Ica77c69580dd69bed4e260779c1f7318307282b1
 2021-07-30 17:03:54 +00:00
Li Li
d2aeb490a8 Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534

Change-Id: I28f1b15ab636063727f02414a98896ee2679c6fc
 2021-07-30 16:50:50 +00:00
Li Li
f97b1decee Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534

Change-Id: I997b46822bd83f9c9f7dc6a02e9514a95b3758a1
 2021-07-30 16:49:33 +00:00
Li Li
ef12967b75 Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev 2021-07-30 16:35:16 +00:00
Zimuzo Ezeozue
9fa86d541a Merge "Fix fd leak while bypassing transcoding in media APIs" into sc-dev am: 3fefc5c3ed am: ce692ac89c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15423590

Change-Id: I11e644c3481cf755dfc16e2b397cd8b72ec01668
 2021-07-30 14:53:47 +00:00
Zimuzo Ezeozue
ce692ac89c Merge "Fix fd leak while bypassing transcoding in media APIs" into sc-dev am: 3fefc5c3ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15423590

Change-Id: I88486c8e7278e5899405a379034a453ed95b19f9
 2021-07-30 14:39:01 +00:00
Zimuzo Ezeozue
39b2de9b9b Merge "Fix fd leak while bypassing transcoding in media APIs" into sc-dev am: 3fefc5c3ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15423590

Change-Id: I6501959f5e472caf6331474f203c13e09b0d6a43
 2021-07-30 14:38:06 +00:00
Zim
366493edd2 Fix fd leak while bypassing transcoding in media APIs 
To call the media service while bypassing transcoding there are 4 file
descriptors involved:

A: The original file descriptor the app owns and is responsible for
closing
B: Dupe of A, to pass into the MediaStore API as an input to receive a
non-transoding fd
C: The output from the MediaStore API
D: Final fd owned by the media service, after C gets duped over binder
as part of setDataSource

We were leaking (B) and (C). Now we close them appropriately.

See I0124ec8fbd0471237e99bab321f903544f8fe1f8 for another 2 fd leak
fix in MediaProvider

Test: atest TranscodeTest
Test: Manual with 'adb shell lsof | grep <filename>'
Bug: 194828489
Bug: 179804072
Change-Id: I978257bbc4a8f6813b6e6a5ce22124257204f432
Merged-In: I978257bbc4a8f6813b6e6a5ce22124257204f432
 2021-07-29 22:05:17 +01:00
Zim
eccf1db4f7 Fix fd leak while bypassing transcoding in media APIs 
To call the media service while bypassing transcoding there are 4 file
descriptors involved:

A: The original file descriptor the app owns and is responsible for
closing
B: Dupe of A, to pass into the MediaStore API as an input to receive a
non-transoding fd
C: The output from the MediaStore API
D: Final fd owned by the media service, after C gets duped over binder
as part of setDataSource

We were leaking (B) and (C). Now we close them appropriately.

See I0124ec8fbd0471237e99bab321f903544f8fe1f8 for another 2 fd leak
fix in MediaProvider

Test: atest TranscodeTest
Test: Manual with 'adb shell lsof | grep <filename>'
Bug: 194828489
Bug: 179804072
Change-Id: I978257bbc4a8f6813b6e6a5ce22124257204f432
 2021-07-29 21:57:57 +01:00
Li Li
bbe06e7b59 Freezer: fix exception when parsing /proc/locks 
The original code is based on /proc/locks manpage. Unfortunately, that
manpage is never correctly updated to include the new field for blocked
locks. The new code detects the extra field. As StringTokenizer is too
heavy, ProcFileReader is used for better performance.

Bug: 194756340
Test: FrameworksUtilTests com.android.internal.util.ProcFileReaderTest
Test: FrameworksCoreTests com.android.internal.os.ProcLocksReaderTest
Test: No /proc/locks parsing exception with blocked locks
Change-Id: I4c9763f9d3091f7d84d2e4b672d7e5cb78b33f59
 2021-07-29 09:18:53 -07:00
TreeHugger Robot
0bc5cce243 Merge "Revert "Add systrace tag for system property"" into sc-dev am: 95e50fed20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336322

Change-Id: I80ccd42ee9cea924cf038f5ae45de75cc41fd311
 2021-07-28 14:53:52 +00:00
TreeHugger Robot
495abb7eab Merge changes from topic "native_hint" into sc-dev am: ea52c87596 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15326475

Change-Id: I805e930ede0c22bbcbec62d1b0738dd7c91f5dc5
 2021-07-28 14:44:51 +00:00
Nandana Dutt
e0a5f0de95 Merge "Note API alternatives in javadoc" into sc-v2-dev am: 138f08b5de am: f8d671f6f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390553

Change-Id: I49a1141e2429564a7c00a49ebbc77bfa1abc71a0
 2021-07-27 09:06:17 +00:00
Nandana Dutt
f8d671f6f1 Merge "Note API alternatives in javadoc" into sc-v2-dev am: 138f08b5de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390553

Change-Id: If7d9fc69b060bb9ff686c153329736f76d7f3063
 2021-07-27 08:52:21 +00:00
Tianjie Xu
36bf6a2e8c Merge "Add a system API UpdateEngine to switch the slot back and forth" am: 4eaa49eeb6 am: 7c7696cd47 am: 547296b419 am: ee4e466a09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698090

Change-Id: I20516865284f9c4c2fc24e5b28a40a38dcd1a9a0
 2021-07-27 03:16:50 +00:00
Tianjie Xu
ee4e466a09 Merge "Add a system API UpdateEngine to switch the slot back and forth" am: 4eaa49eeb6 am: 7c7696cd47 am: 547296b419 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698090

Change-Id: Ic218ff3aeed857379ef69026f7f29206df70560b
 2021-07-27 03:03:22 +00:00
Tianjie Xu
547296b419 Merge "Add a system API UpdateEngine to switch the slot back and forth" am: 4eaa49eeb6 am: 7c7696cd47 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698090

Change-Id: Iea96fe5411794ca3a95031661edea581c3334b6b
 2021-07-27 02:42:21 +00:00
Tianjie Xu
7c7696cd47 Merge "Add a system API UpdateEngine to switch the slot back and forth" am: 4eaa49eeb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698090

Change-Id: I60bdebcc482028135dd05979bb50cba5ca656f13
 2021-07-27 02:19:18 +00:00
Tianjie Xu
4eaa49eeb6 Merge "Add a system API UpdateEngine to switch the slot back and forth" 2021-07-27 02:03:10 +00:00
Tianjie Xu
a15b3fb07b Merge "Add owner file for UpdateEngine" am: 5c8dce3ada am: 254fd31028 am: 7263582a8e am: a05d2e2076 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776894

Change-Id: Ifdcb23df42e8e9c9ef8eaf5614ed134136562c4c
 2021-07-27 01:59:08 +00:00
Tianjie Xu
a05d2e2076 Merge "Add owner file for UpdateEngine" am: 5c8dce3ada am: 254fd31028 am: 7263582a8e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776894

Change-Id: I6a04ebc2290d74f4315e70caf710ff2bddc278b4
 2021-07-27 01:53:41 +00:00
Tianjie Xu
7263582a8e Merge "Add owner file for UpdateEngine" am: 5c8dce3ada am: 254fd31028 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776894

Change-Id: Id6adaa0b9a70475d09fd55f5b36ba9782c40d160
 2021-07-26 21:49:56 +00:00
Tianjie Xu
254fd31028 Merge "Add owner file for UpdateEngine" am: 5c8dce3ada 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776894

Change-Id: I55b82fe8a847e94cca9769afbf29ec24cd46a988
 2021-07-26 21:33:14 +00:00
TreeHugger Robot
dfa32b6bf0 Merge changes from topic "native_hint" into sc-dev am: ea52c87596 am: 2194851f5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15326475

Change-Id: If0a6ed03108a1ae793cbba0abcdd78e6331c25b3
 2021-07-26 18:52:23 +00:00
Nandana Dutt
f89b637865 Note API alternatives in javadoc 
Note alternatives for getExternalStorageDirectory() and
getExternalStoragePublicDirectory()

Change-Id: Ibb7238e0dfc780a88940507aaf1d5cf4103bbee4
BUG: 194164033
Test: treehugger build
 2021-07-26 12:30:52 +00:00
Tianjie
dcbd9ea138 Add owner file for UpdateEngine 
Test: th
Change-Id: I50c775874cb9ad54f049e415b6fb68ec29d7f1c8
 2021-07-23 17:15:43 -07:00
TreeHugger Robot
95e50fed20 Merge "Revert "Add systrace tag for system property"" into sc-dev 2021-07-23 17:04:39 +00:00
TreeHugger Robot
18517e9551 Merge changes from topic "native_hint" into sc-dev am: ea52c87596 am: 9533a3db22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15326475

Change-Id: If8502e41cbc2cf88b6ed9634741e57f066ab3652
 2021-07-22 21:51:12 +00:00
TreeHugger Robot
2194851f5c Merge changes from topic "native_hint" into sc-dev am: ea52c87596 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15326475

Change-Id: I8dde7d37c30d756108b007dd0cf09de057f4b913
 2021-07-22 21:33:26 +00:00
Bo Liu
0b2ad9f70d Implement java PerformanceHintManager on top of native 
Note some exceptions became silence errors in this conversion.

Test: None
Bug: 194204196
Change-Id: Ia3cc7f2396f2e307a23b40b3f104a2fa90352196
 2021-07-22 11:33:13 -04:00
Bowgo Tsai
e169c22053 Revert "Add systrace tag for system property" 
Revert "Add systrace tag for system property"

Revert "Adding system property tracing"

Revert submission 1403568-sysprop_trace

Reason for revert: makes property get/set non-reentrant
Reverted Changes:
I6f85f3f52:Add systrace tag for system property
Id2b93acb2:Adding system property tracing
Id78992d23:Add systrace tag for system property
I1ba9fc7bd:Add systrace tag for system property

Bug: 193050299
Change-Id: Iaf522b403e51abcf1d49804f35a184b4aa0d3209
Merged-In: Iaf522b403e51abcf1d49804f35a184b4aa0d3209
Test: build and boot a device
(cherry picked from commit 137d78bb67)
 2021-07-22 04:41:03 +00:00
Lee Shombert
1171265b9d Merge changes I68868b7f,I092d1385 
* changes:
  Do not cache wildcard users (UserManager)
  Do not cache wildcard users (PackageManager)
 2021-07-21 23:07:00 +00:00
TreeHugger Robot
77362426e6 Merge "DropBoxManager: Fix doc build error" into sc-dev am: 019189c35a am: a945369393 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341836

Change-Id: If40ca51dc06560536eb80bd02adebfaa43b55244
 2021-07-21 01:55:52 +00:00
TreeHugger Robot
0829767999 Merge "DropBoxManager: Fix doc build error" into sc-dev am: 019189c35a am: fd0f972819 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341836

Change-Id: I965e36ca78d4cbc3c1b971012f2e3dad7a771b3f
 2021-07-21 01:55:28 +00:00