drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
616,700 Commits 1 Branch 0 Tags
Commit Graph

616700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
aa38ee0476 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib849e232cdabfad25a83aa89178fb0c1c7039ed8
 2020-12-25 13:30:32 -08:00
Serik Beketayev
db38c539cf Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666 am: 40e7949c5f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6f5bf74bf461f762472ea1d88553db3b9719c80
 2020-12-25 09:58:40 +00:00
Serik Beketayev
40e7949c5f Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
 2020-12-25 09:45:54 +00:00
Yanting Yang
d5a74faf9c Merge "Create RestrictedTopLevelPreference for silky home" 2020-12-25 09:38:58 +00:00
lihuan3
ecc7a0a55a [Bugfix] Fix the wrong lastBackgroundTime in UidRecord 
Test:A process call into updateOomAdjLocked in background
which will set its uidRec.lastBackgroundTime = SystemClock.uptimeMillis();
and then in the idleUidsLocked() method it will compare the
lastBackgroundTime with the elapsedRealtime which may cause a
process which just go into background a few seconds ago become
idle state and then be killed by this

Change-Id: I419a555ef2f6490c26290b19fc86756fde293551
Signed-off-by: lihuan3 <lihuan3@xiaomi.com>
 2020-12-25 09:38:42 +00:00
Serik Beketayev
5565118666 Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic839f183b48279532dcfb484818457a5372087b2
 2020-12-25 09:21:03 +00:00
Yanting Yang
84d82cd0e9 Create RestrictedTopLevelPreference for silky home 
Based on UX design, create a new restricted preference for the items on
the top level page which don't need a the restricted icon and shouldn't
be grayed-out.

Bug: 168166015
Bug: 174964139
Test: robotest
Change-Id: If52b7d14c13d33f964a6b12612747db9323979a2
 2020-12-25 09:04:24 +00:00
Serik Beketayev
3c3711dffd Merge "[Mainline] Migrate ProxyInfo" 2020-12-25 08:32:04 +00:00
TreeHugger Robot
38c54adcaa Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-25 08:14:54 +00:00
Yu-Han Yang
cd873ea858 Handle getExtension returning nullptr 
Bug: 172509939
Fixes: 172509939
Test: on Cuttlefish
Change-Id: Ic4afff8748504a92068f024c8b1eee2f88b7be68
 2020-12-24 21:30:32 -08:00
Bill Yi
63d80223c7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iace492128d2d897e13283052f3bc5b38d39ab77a
 2020-12-24 21:27:17 -08:00
Stanley Wang
9eb96adc00 Merge "Create a main switch preference widget." 2020-12-25 03:11:53 +00:00
Remi NGUYEN VAN
ec29ea445c Merge "Migrate away from AsyncChannel in NetworkAgent" 2020-12-25 01:57:44 +00:00
TreeHugger Robot
4f337713f0 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-25 01:39:11 +00:00
TreeHugger Robot
5422d0a62b Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-25 00:01:25 +00:00
Bill Yi
5bbb47e2af Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia02975a07e14afa616482491a784ce21c8cbbb8e
 2020-12-24 10:43:19 -08:00
Bill Yi
ae2d946c96 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9f66e56fb8f45be75b2aa867161d1f5bc6b5c230
 2020-12-24 10:14:18 -08:00
Greg Kaiser
6f69f18ae1 AudioSystem: Fix null check 
We move our null check to before dereferencing the pointer.

Test: TreeHugger
Change-Id: Ia7ad8e144ab734a3d178d5307cbafa7ea972be9e
 2020-12-24 09:41:57 -08:00
TreeHugger Robot
5e6d61140f Merge "Add explicit Result::ok() where missing" 2020-12-24 17:06:27 +00:00
Baligh Uddin
d7a0fe8d04 [automerger skipped] Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin am: 3139f6d12c -s ours 
am skip reason: Change-Id Id02e28648e922a30d6a81cf92b39eff4ca3cc002 with SHA-1 09fdba4271 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e14ba65f614f2da1205ddf946677ce9482fce6e
 2020-12-24 14:14:19 +00:00
Bernie Innocenti
d5f6582f45 Add explicit Result::ok() where missing 
This is part of a large-scale cleanup to remove operator bool() from
android::base::expected. For more details, see aosp/1533001.

Bug: 176148206
Test: m checkbuild continuous_instrumentation_tests continuous_instrumentation_tests_api_coverage continuous_native_tests device-tests platform_tests
Exempt-From-Owner-Approval: mechanical large-scale change
Change-Id: Ie67a688b2827d66e585c87f881cce7851b0a60b5
 2020-12-24 13:35:43 +00:00
Riddle Hsu
8d5de97b83 Fix result code of launching existing activity in split 
Since all secondary leaf tasks will be reparented to the organizer
created task, when launching an existing task in background in
split-screen mode, the root task mTargetStack is always the
organizer created task which is always the top of display area.
Then mMovedToFront is always set to false.

This may cause missing some launch metrics in split-screen because
ActivityMetricsLogger won't count the number for result code
START_DELIVERED_TO_TOP.

The test testSplitScreenTaskToFront didn't catch the problem
because it still creates tasks in the old way (multiple split
secondary root tasks under display area) which doesn't exist
in current design.

Fixes: 176277089
Test: ActivityStarterTests#testSplitScreenDeliverToTop
      ActivityStarterTests#testSplitScreenTaskToFront

Change-Id: I6bdb1faf8f7dbfb1e8a6f75279b87ffc9072fb31
 2020-12-24 11:32:33 +00:00
Jason Hsu
51ab47ec28 Merge "Add key ACCESSIBILITY_BUTTON_MODE" 2020-12-24 11:26:46 +00:00
TreeHugger Robot
ca3f3e0353 Merge "Make ImmersiveModeConfirmation trusted" 2020-12-24 10:30:17 +00:00
Sudheer Shanka
58fb9a2c1f Merge "Update usage of allowlist/denylist in some method names/comments." am: 771aa062b9 am: b4c68c4216 am: 0b39593d11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40b28e3be169fbc59f8b889871ed938b45de2fab
 2020-12-24 09:50:20 +00:00
Sudheer Shanka
0b39593d11 Merge "Update usage of allowlist/denylist in some method names/comments." am: 771aa062b9 am: b4c68c4216 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e8af4a71f23438e830b1a44834719b7c488d67
 2020-12-24 09:36:33 +00:00
Stanley Wang
5728b5be2f Create a main switch preference widget. 
Based on our ux spec, we create this widget to
let everyone can follow up our spec easily.

Bug: 175181773
Test: Run robotest and apply this widget in Settings and see the ui
Change-Id: I4ea5f38c44aacfeb2c8dbe4a7d31159712f95441
 2020-12-24 17:35:08 +08:00
Sudheer Shanka
b4c68c4216 Merge "Update usage of allowlist/denylist in some method names/comments." am: 771aa062b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d6e7220d742e38bd153916a95e43d5de0da830e
 2020-12-24 08:40:56 +00:00
Sudheer Shanka
771aa062b9 Merge "Update usage of allowlist/denylist in some method names/comments." 2020-12-24 08:16:51 +00:00
Louis Chang
f16b926a7d Merge "Throw exceptions if obtain ActivityStarter before system ready" 2020-12-24 07:57:55 +00:00
TreeHugger Robot
669888436a Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-24 07:41:50 +00:00
Aaron Huang
1346575ebc Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" am: a34d9a7af1 am: 8f96256d85 am: 27ace52564 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I023815a53f01a0459b94033b7e2fa2ed91cca86a
 2020-12-24 07:02:53 +00:00
Baligh Uddin
a5edace4ab [automerger skipped] Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd2917a am: dc68043ad0 am: a57f85b733 -s ours 
am skip reason: Change-Id I9031a37c84e17c2cf5c0552d1b33e8fd59216b92 with SHA-1 dcab236e8a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I492101fb4f28555091631f196763566c3d4243e9
 2020-12-24 07:01:55 +00:00
Aaron Huang
27ace52564 Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" am: a34d9a7af1 am: 8f96256d85 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73403fbbf0f7ba0a233e4866273698fb0f43019b
 2020-12-24 06:51:17 +00:00
Baligh Uddin
a57f85b733 Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd2917a am: dc68043ad0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533852

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2588d9be48b50d41aaf5a5440268bb377081242
 2020-12-24 06:50:43 +00:00
TreeHugger Robot
36d9d8e452 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 348c6f01e6 -s ours am: 787256cf91 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39961b576424bed0c2843794c25fc528af28ff1b
 2020-12-24 06:44:28 +00:00
TreeHugger Robot
8376ae1b90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d71616a3a8 -s ours am: 914dbb961e -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73ab2c49281e29f56dac4af2fb86bf5b4525e18b
 2020-12-24 06:44:14 +00:00
Remi NGUYEN VAN
f987771acb Merge "Split connectivity JNI and service jar" am: eeef6c857a am: 550acd58d6 am: 78d2f9ac80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I914bd578b1c64d43c59541d92ff88e6c5d423ed7
 2020-12-24 06:43:47 +00:00
TreeHugger Robot
787256cf91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 348c6f01e6 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If28a97b66bbeeb39b85ee6dfa88297786285b85c
 2020-12-24 06:38:27 +00:00
TreeHugger Robot
914dbb961e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d71616a3a8 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e60a70bbcf5aef4c7664c33a6e8dd7db43c43db
 2020-12-24 06:36:22 +00:00
Aaron Huang
8f96256d85 Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" am: a34d9a7af1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc48a3618c12f332a5e067973519ab7777058fdf
 2020-12-24 06:34:32 +00:00
Baligh Uddin
dc68043ad0 Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd2917a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533852

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief078339fcd28ea8899eceec6ec611429c30a2ae
 2020-12-24 06:26:58 +00:00
TreeHugger Robot
348c6f01e6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-24 06:21:03 +00:00
TreeHugger Robot
d71616a3a8 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-24 06:19:25 +00:00
Serik Beketayev
4abaecefc2 [Mainline] Migrate ProxyInfo 
Bug: 173455434
Test: atest FrameworksNetTests
Change-Id: I924aed710b62a0c91b888a9e04ac2c90cdfd88d0
 2020-12-23 22:15:51 -08:00
Aaron Huang
a34d9a7af1 Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" 2020-12-24 06:03:43 +00:00
Eugene Susla
69db80497e Merge "Nullcheck device profile when re-granting on package change" 2020-12-24 05:51:20 +00:00
Baligh Uddin
e41cd2917a Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" 2020-12-24 05:35:23 +00:00
junyulai
decbf9f64a Add test for increment operation count on non-default network 
Currently, when the caller increment operation count, the count
will be blamed on the active default network even though the
traffic is all generated on other networks. This is kind
of weird. But in order to change the behavior, extend test
coverage first.

Test: atest com.android.server.net.NetworkStatsServiceTest#testOperationCount_nondefault_traffic
Bug: 174123988

Change-Id: Ia5b5aa3601de15bb9ee5a29f6d184d122f1c5352
 2020-12-24 13:22:59 +08:00
Bill Yi
5409a48645 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2def864fd608237cabb1e878e807262b2830f7d2
 2020-12-23 20:58:24 -08:00