Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
586,028 Commits 3 Branches 0 Tags
e27fbdb2cfdffaa107ea1918214f9ed07e481bfe
Commit Graph

586028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
e27fbdb2cf Merge "Grant new permission for storage manager" 2020-10-05 15:24:54 +00:00
Anton Hansson
897df7e3ca Merge "Re-submit "Add genrules for merged removed.txt files"" am: c2ee800f20 am: 41d0224165 am: c3edde5946 am: 18cf87b9f3 am: a5885916fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446816

Change-Id: I6c2a2d1a2b76d04720ead9f2c78075e2ddf8c65f
 2020-10-05 14:24:27 +00:00
Anton Hansson
b473774d1d [automerger skipped] Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: 70defe1cdb am: 2756147fc0 am: d02f58190e am: 80344cf613 -s ours 
am skip reason: Change-Id I3d9f2049cf898b5e551a5c5764df423abaa5e92d with SHA-1 a517d44f4e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635

Change-Id: If3a0e1416ee61dc030048fc6e0a61d38ef5f4384
 2020-10-05 14:23:55 +00:00
TreeHugger Robot
1a19c2ec65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7e335c887e -s ours am: 9aee32dba9 -s ours am: 3abb351221 -s ours am: 77a9e8ad33 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759559

Change-Id: Ic09a271826e571cf2ad1a0215bf30543579bfbec
 2020-10-05 14:22:48 +00:00
Riddle Hsu
fa97d47b01 Merge "Support latency metrics for recents gesture" 2020-10-05 14:13:16 +00:00
Anton Hansson
a5885916fd Merge "Re-submit "Add genrules for merged removed.txt files"" am: c2ee800f20 am: 41d0224165 am: c3edde5946 am: 18cf87b9f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446816

Change-Id: Ib32b8ec1ad7c55ddfdba965e8d8426a85d98b3de
 2020-10-05 13:50:50 +00:00
Anton Hansson
80344cf613 Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: 70defe1cdb am: 2756147fc0 am: d02f58190e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635

Change-Id: Ifc3da9d4b1aa7699a5d3cb36e32d0f58c3062957
 2020-10-05 13:50:38 +00:00
TreeHugger Robot
77a9e8ad33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7e335c887e -s ours am: 9aee32dba9 -s ours am: 3abb351221 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759559

Change-Id: If06abffde6a52b16f9fee3cb42fe439623e0557b
 2020-10-05 13:50:11 +00:00
Anton Hansson
18cf87b9f3 Merge "Re-submit "Add genrules for merged removed.txt files"" am: c2ee800f20 am: 41d0224165 am: c3edde5946 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446816

Change-Id: I44126e7fbfb166eb4d0247a7495c8d373011ec57
 2020-10-05 13:38:09 +00:00
Anton Hansson
d02f58190e Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: 70defe1cdb am: 2756147fc0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635

Change-Id: I63c4ad39ed92947aa925e5936a4d1f22669f00a1
 2020-10-05 13:37:48 +00:00
TreeHugger Robot
3abb351221 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7e335c887e -s ours am: 9aee32dba9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759559

Change-Id: I46c4ab7ad5519a51a670d6ae96a488e0bc5e3cfb
 2020-10-05 13:37:05 +00:00
Neil Fuller
e7741e18a5 Merge "System API annotation and API .txt changes" 2020-10-05 13:36:17 +00:00
Treehugger Robot
b069099836 Merge "Build stub libraries with smaller deps" am: 68d17855ea am: 88c2c1aa6f am: 1ed5aad300 am: e13d2abfb9 am: 2fe07d3a1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440213

Change-Id: Ie05c629ad2ba24517954bd4722e6a3b7e1546e7a
 2020-10-05 13:18:57 +00:00
Anton Hansson
c3edde5946 Merge "Re-submit "Add genrules for merged removed.txt files"" am: c2ee800f20 am: 41d0224165 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446816

Change-Id: Ied03efe8ac290a7dfb917c91e70cc664dfecaee9
 2020-10-05 13:10:47 +00:00
Anton Hansson
2756147fc0 Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: 70defe1cdb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635

Change-Id: Ifc377c2b8ba57bc14cfb6eb98d599e2496ef62f9
 2020-10-05 13:10:31 +00:00
TreeHugger Robot
9aee32dba9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7e335c887e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759559

Change-Id: Ib2fa7984382ad1ceb953bd0f38da1243a7b10ee9
 2020-10-05 13:10:16 +00:00
Treehugger Robot
2fe07d3a1f Merge "Build stub libraries with smaller deps" am: 68d17855ea am: 88c2c1aa6f am: 1ed5aad300 am: e13d2abfb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440213

Change-Id: I67a32bec2322109d0465bf00f9575f6cf47f66b9
 2020-10-05 13:01:26 +00:00
Anton Hansson
41d0224165 Merge "Re-submit "Add genrules for merged removed.txt files"" am: c2ee800f20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446816

Change-Id: I49f537f11f0e00b058274365622b844f55223fd0
 2020-10-05 12:59:40 +00:00
Anton Hansson
70defe1cdb Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635

Change-Id: I6ef1bfbf4dcd39983e94207ff7f760e152da2a97
 2020-10-05 12:56:06 +00:00
TreeHugger Robot
7e335c887e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-05 12:49:16 +00:00
Anton Hansson
c2ee800f20 Merge "Re-submit "Add genrules for merged removed.txt files"" 2020-10-05 12:48:39 +00:00
Treehugger Robot
e13d2abfb9 Merge "Build stub libraries with smaller deps" am: 68d17855ea am: 88c2c1aa6f am: 1ed5aad300 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440213

Change-Id: I9e438e107e5d505ac8bbe89501d774aedb3c04a5
 2020-10-05 12:36:38 +00:00
Anton Hansson
c29f606cc7 Merge "Explicitly reference framework-wifi app build rule" 2020-10-05 12:27:45 +00:00
Zimuzo Ezeozue
2d9b034fdc Merge "Removed unused mount mode constants" 2020-10-05 12:15:34 +00:00
Treehugger Robot
1ed5aad300 Merge "Build stub libraries with smaller deps" am: 68d17855ea am: 88c2c1aa6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440213

Change-Id: I8202f5de8d08fcf337c8a842c289f857ebfa172c
 2020-10-05 12:12:54 +00:00
Ioana Stefan
18811b014b Merge "Integrate InsetsSourceProviderProto into ImeInsetsSourceProviderProto" 2020-10-05 11:54:33 +00:00
Treehugger Robot
88c2c1aa6f Merge "Build stub libraries with smaller deps" am: 68d17855ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440213

Change-Id: Id291b67b85d4c14452f86cfdc11e4a1db721aeec
 2020-10-05 11:37:22 +00:00
Treehugger Robot
b596de1e99 Merge "Reconnect CEC HAL callback" am: f1df6bf33a am: 70c1c7069f am: 339cefd32a am: d609fa5d99 am: 4a4aa06e8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422871

Change-Id: I43fa9542259988e63872323cf19f23cfee510102
 2020-10-05 11:35:56 +00:00
Treehugger Robot
68d17855ea Merge "Build stub libraries with smaller deps" 2020-10-05 11:17:01 +00:00
Alex Johnston
0a016bca46 Merge "Revert "Replace remaining enforceXXX methods"" 2020-10-05 11:11:11 +00:00
Alex Johnston
25e26d9055 Revert "Replace remaining enforceXXX methods" 
This reverts commit 2cc14d046e.

Reason for revert: Factory reset function can not work
This was caused by the method getCallerIdentityOptionalAdmin().
When the component name is null and no active admin is found,
getCallerIdentity() should be called instead of throwing a
security exception.

Bug: 170057677
Change-Id: I46f181a5be5bf6cff7be6ea0f8965c4cd7be1f01
 2020-10-05 11:10:13 +00:00
Treehugger Robot
4a4aa06e8a Merge "Reconnect CEC HAL callback" am: f1df6bf33a am: 70c1c7069f am: 339cefd32a am: d609fa5d99 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422871

Change-Id: I134bf056c09473c0accbefb04a6399799fb49667
 2020-10-05 11:05:55 +00:00
Treehugger Robot
d609fa5d99 Merge "Reconnect CEC HAL callback" am: f1df6bf33a am: 70c1c7069f am: 339cefd32a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422871

Change-Id: I06cb30773d309fed7bdbc108003d0db5e0e567b4
 2020-10-05 10:54:01 +00:00
Anton Hansson
5f59b6f707 Explicitly reference framework-wifi app build rule am: a517d44f4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12752580

Change-Id: Ic9cbad0d25c589bf51dfef0e48ca41aca51fa450
 2020-10-05 10:53:46 +00:00
Anton Hansson
35d5ae3aa0 Explicitly reference framework-wifi app build rule 
This works around a build-system limitation where it does not know
which jars to feed r8 to resolve all classes during proguarding.

Bug: 160453030
Bug: 169931783
Test: build_mainline_modules.sh (with prebuilt sdk)
Change-Id: I3d9f2049cf898b5e551a5c5764df423abaa5e92d
Merged-In: I3d9f2049cf898b5e551a5c5764df423abaa5e92d
 2020-10-05 11:43:39 +01:00
Treehugger Robot
339cefd32a Merge "Reconnect CEC HAL callback" am: f1df6bf33a am: 70c1c7069f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422871

Change-Id: I62b4af1673c460375d4929991146218beeadc0e4
 2020-10-05 10:27:25 +00:00
Treehugger Robot
70c1c7069f Merge "Reconnect CEC HAL callback" am: f1df6bf33a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422871

Change-Id: I1dcb74c11b66eb9e6fb26b366bb1ccde399cc772
 2020-10-05 10:05:45 +00:00
Treehugger Robot
f1df6bf33a Merge "Reconnect CEC HAL callback" 2020-10-05 09:38:35 +00:00
Jiyong Park
c0f8a28e54 Build stub libraries with smaller deps 
The stub libraries had a dependency to framework-internal-util which is
a collection of java static libraries whose source code is
auto-genmerated (e.g. via protoc, aidl, etc.)

The library was added as a dependency because some Java files that are
fed into the metalava for the stub code generation have references to
some of the auto-generated symbols. However, this is more than
necessary. Furthermore, that setup will create a circular dependency
when framework-internal-utils (or its transitive dependencies) have a
dependency to the stub libraries due to 'sdk_version' setting.

Fixing the problem by replacing the dependency to
framework-internal-util with a few number of libraries.

Bug: 169618843
Test: m
Change-Id: I30c953ed220e84ab295548845fff0b26e3c060b6
 2020-10-05 18:30:33 +09:00
Zim
c8fe3d2acd Removed unused mount mode constants 
Since FUSE in R, there are only 4 mount modes that are used
from IVold.aidl:

REMOUNT_MODE_NONE
REMOUNT_MODE_DEFAULT
REMOUNT_MODE_INSTALLER
REMOUNT_MODE_PASS_THROUGH
REMOUNT_MODE_ANDROID_WRITABLE

Bug: 148454884
Test: Manual
Change-Id: I62b66083f2099b429474872b6f9c7cffb9fb906d
 2020-10-05 10:26:14 +01:00
Neil Fuller
33b9610bbf Merge "Add the secondary provider hand-over logic" 2020-10-05 09:10:56 +00:00
TreeHugger Robot
9e34116a67 Merge "Remove todo comment from IME tracing proto" 2020-10-05 08:54:16 +00:00
Riddle Hsu
613ba2d25e Support latency metrics for recents gesture 
Accpet the event time from RecentsAnimation#startRecentsActivity.
Also remove unused method of recents animation in activity manager.

Bug: 169221287
Test: Enable statsd log: "adb shell cmd stats print-logs"
      Touch gesture navigation bar.
      adb logcat | grep statsd | grep "(48)"
      The line may contain 0x100000->4[I] 0x110000->20[I]
      that means 4=by recents and 20=latency 20ms.

Change-Id: Ia188a6a3b0dab9edaa0052df3b18508f8cc895d3
 2020-10-05 15:56:01 +08:00
TreeHugger Robot
e1505c7959 Merge "Use pid and uid for getCurrentTvChannelInfo" 2020-10-05 06:12:38 +00:00
Treehugger Robot
1d9fa39be9 Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: 004f473e97 am: 9cd671a4a2 am: e6e08b9836 am: a9bb7e8fff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610

Change-Id: Ifb6e7159d4c45136414a9e1a9d0c8f05abdc1ecb
 2020-10-05 05:57:55 +00:00
Treehugger Robot
a9bb7e8fff Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: 004f473e97 am: 9cd671a4a2 am: e6e08b9836 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610

Change-Id: Id033b657976a0b29dad05f44a8f7117ada62b81d
 2020-10-05 05:44:37 +00:00
Treehugger Robot
e6e08b9836 Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: 004f473e97 am: 9cd671a4a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610

Change-Id: Idbbe5128c77d67040deb197e3437bf81abf8c1ad
 2020-10-05 05:15:35 +00:00
Treehugger Robot
9cd671a4a2 Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: 004f473e97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610

Change-Id: I70b49d0a10b80f378dcd2ba78b5bac848e40e5c9
 2020-10-05 04:46:25 +00:00
Bill Yi
f76f597199 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I706a3301c7832d6aa29fd0a725eb01b9c5894690
 2020-10-04 21:42:57 -07:00
Treehugger Robot
004f473e97 Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610

Change-Id: I0a5398513c4572db839e3713109bb326f0261954
 2020-10-05 04:26:10 +00:00