Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
635,348 Commits 3 Branches 0 Tags
e16296645232efe8b1d52c736ca501bb5fedd9ee
Commit Graph

635348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi NGUYEN VAN
e162966452 Merge "Use jniThrowErrnoException from JNIHelp" into sc-dev am: 906cde3fde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13927661

Change-Id: I14f8399ef6a290bbf7191907f6e338761da7fbaf
 2021-03-22 13:16:50 +00:00
Roshan Pius
4b0ff1000b Merge "resolve merge conflicts of 403b7fd0b0 to stage-aosp-master" into sc-dev am: 1d050e01e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13944368

Change-Id: I27011732c7cb4eec1b99a5dd6284e0c957aff929
 2021-03-22 13:16:35 +00:00
Roshan Pius
cf4bb1aaf9 Merge "NetworkControllerWifiTest: Fix unit test" into sc-dev am: 819ee3fe2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921710

Change-Id: Ifb3a058d4092d92b6bd22c94af7073ac739864c3
 2021-03-22 13:16:29 +00:00
TreeHugger Robot
74e2c6d052 Merge "Add device config parameters to DiscreteRegistry." into sc-dev am: 41ec7a8e38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13901257

Change-Id: Icc1c2459f4c240def20a5a3cc074df96e5ebde99
 2021-03-22 13:16:00 +00:00
Hongbo Zeng
a777676b42 Merge "Support getSlicingConfig() API for 5G Slicing Configuration" into sc-dev am: 80e8713490 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13518171

Change-Id: Ib55224df31a9aed87dfc946e8e2dfeaae8e82ebb
 2021-03-22 13:14:56 +00:00
Adam He
9fdeb4ed6e Merge "Implement TranslationCallback with support for partial responses." into sc-dev am: 2e43f72bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13782366

Change-Id: I5d11cff78b7bd30f96222a5e07da2baa547dfd56
 2021-03-22 13:14:11 +00:00
Shivam Agrawal
0aa496ebb6 Merge "Ensure Display Settings Overrides Do Not Impact TestDisplayContent" into sc-dev am: 19d042f7b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13901965

Change-Id: I1094f0d5cf3610b06b30a24b5bcb6689d250f976
 2021-03-22 13:13:48 +00:00
Chris Li
3836a727c4 Merge "Sandboxing for non-resizable in multiwindow" into sc-dev am: 67b5d6f6f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13830555

Change-Id: I7a5c321f52b7c91e4daa4e46e9b91afc12d9afa1
 2021-03-22 13:13:27 +00:00
TreeHugger Robot
1a6a4d3dff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e2a4f53119 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0af08725cfac9f5dcf4d92cac65313452e8fd4f
 2021-03-22 13:13:15 +00:00
TreeHugger Robot
7b7f0dee7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 563df99655 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f7f37baf97597d93c1901b55ed9be9876953d39
 2021-03-22 13:13:05 +00:00
TreeHugger Robot
de02bec8b2 Merge "Ignore the documentLaunchMode in testing" into sc-dev am: 0748fe2254 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13898746

Change-Id: I0165cad98e9c0e1aa8126acc5e4cac7947512f3c
 2021-03-22 13:12:49 +00:00
Ruslan Tkhakokhov
ac5600e939 Merge "Update BackupEligibilityRules" into sc-dev am: e05824f661 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13929327

Change-Id: Iffd19f46800141b6aa1a2e5d17b103ce83c063a2
 2021-03-22 13:12:31 +00:00
TreeHugger Robot
983f58f05a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5f573843ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6c64d47de6fedaf637a5542cff6b1a97c879f59
 2021-03-22 13:12:14 +00:00
Darryl Johnson
e0093f1c96 Merge changes from topic "jumbo-sidecar-posture" into sc-dev am: 30cefedcdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13903089

Change-Id: Ied55fed1f5a7ef5b1b588dd62a4034114eb5f488
 2021-03-22 13:11:57 +00:00
Jeff Sharkey
07754b568b Merge "Surface "neverForLocation" through public API." into sc-dev am: 7be2cf8c4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13923564

Change-Id: I240180dc469c6b89c8c56458dcea1a0adba6d55b
 2021-03-22 13:10:11 +00:00
Jeff DeCew
513dae352d Merge "Minimal change to remove development settings." into sc-dev am: 7d1ca13d41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13926946

Change-Id: I02d4698e5aa67aeb9dce38233885fd14ee0a929d
 2021-03-22 13:09:35 +00:00
TreeHugger Robot
e723e88f36 Merge "Change the spring constants for EdgeEffect" into sc-dev am: 6f668bf61c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13934374

Change-Id: I28bbc4c6cdc5fc65c982f1743986332cd66f4f3e
 2021-03-22 13:09:14 +00:00
TreeHugger Robot
002f954b1e Merge "[incfs] Allow multiple timed jobs at the same time point" into sc-dev am: 99d36e3e28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13933467

Change-Id: I970dfbe1f7e70c6c6a0c7f74e53a7f4f9f8c3cba
 2021-03-22 13:07:50 +00:00
Adam Bookatz
ef15be145e Merge "Move upgradeUserTypesLU code" into sc-dev am: ee9e9b6f98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13932924

Change-Id: I985d3fd544425c040f7fe17e9d0ce045843826cd
 2021-03-22 13:07:28 +00:00
Sean Stout
e763afd941 Merge "Only create DPCs for LocalDisplays & FLAG_OWN_DISPLAY_GROUP" into sc-dev am: dcdb236a6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13928250

Change-Id: If803bdbb0317aa0b6347e357e9c5d1c985e00162
 2021-03-22 13:07:09 +00:00
TreeHugger Robot
03d37e9023 Merge "Lazy load the allocation of Slog message formatting objects." into sc-dev am: 864c714d77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13932384

Change-Id: I35a081e28ec8f716330df49bf520a49f29ec6ea3
 2021-03-22 13:06:51 +00:00
Tyler Gunn
f4e27d43e2 Merge "Propagate call quality reports from Telephony to CallDiagnosticService." into sc-dev am: 5bb6b8ad57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13878696

Change-Id: I4cfa9936d1f2b46005df52e943adeffa5680d08c
 2021-03-22 13:06:29 +00:00
TreeHugger Robot
9e4e8cd13e Merge "Updates to API based on API council feedback." into sc-dev am: 9f15b8d17a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13891798

Change-Id: I8d0ac1cce55dd0795aaf679da52b5a0ddb15b29e
 2021-03-22 13:05:20 +00:00
Bob Badour
1dba67a98a Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev am: de3fb7e9b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13923004

Change-Id: Icfde671b0753b1553e0dbbdc6de4c35d06febeac
 2021-03-22 13:02:52 +00:00
JW Wang
71eb96cf66 Merge changes from topic "181092466_1" 
* changes:
  Move version code checking out of StagingManager (3/n)
  Restart verification for committed sessions that are not READY (2/n)
  Do APK verification before committing sessions to StagingManager (1/n)
 2021-03-22 02:18:20 +00:00
Remi NGUYEN VAN
906cde3fde Merge "Use jniThrowErrnoException from JNIHelp" into sc-dev 2021-03-22 00:20:36 +00:00
Roshan Pius
1d050e01e0 Merge "resolve merge conflicts of 403b7fd0b0 to stage-aosp-master" into sc-dev 2021-03-21 23:41:31 +00:00
Roshan Pius
819ee3fe2d Merge "NetworkControllerWifiTest: Fix unit test" into sc-dev 2021-03-21 23:41:31 +00:00
TreeHugger Robot
41ec7a8e38 Merge "Add device config parameters to DiscreteRegistry." into sc-dev 2021-03-21 22:56:05 +00:00
Stanislav Zholnin
3c46aca490 Add device config parameters to DiscreteRegistry. 
DiscreteRegistry cut off and quantization can be set using
adb shell device_config command.

Bug: 176965672
Test: in development
Change-Id: If4df5413d7c7f9bcbdcb751ac2ab772d51c1da80
 2021-03-21 21:18:23 +00:00
Roshan Pius
00617edb46 resolve merge conflicts of 403b7fd0b0 to stage-aosp-master 
Change-Id: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
 2021-03-21 19:16:33 +00:00
Roshan Pius
2322c835cb NetworkControllerWifiTest: Fix unit test 
WifiInfo.makeCopy(boolean) was changed to WifiInfo.makeCopy(long).

Bug: 156867433
Bug: 162602799
Test: Compiles
Change-Id: Idec6165f6cf9819c56513a65c6958f2390cddbfe
 2021-03-21 17:56:42 +00:00
Hongbo Zeng
80e8713490 Merge "Support getSlicingConfig() API for 5G Slicing Configuration" into sc-dev 2021-03-21 10:55:07 +00:00
Adam He
2e43f72bf1 Merge "Implement TranslationCallback with support for partial responses." into sc-dev 2021-03-21 09:45:33 +00:00
TreeHugger Robot
5c66817292 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-21 03:30:50 +00:00
Shivam Agrawal
19d042f7b9 Merge "Ensure Display Settings Overrides Do Not Impact TestDisplayContent" into sc-dev 2021-03-20 23:49:24 +00:00
Chris Li
67b5d6f6f8 Merge "Sandboxing for non-resizable in multiwindow" into sc-dev 2021-03-20 20:29:06 +00:00
TreeHugger Robot
a8f9c385b3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-20 18:03:33 +00:00
TreeHugger Robot
dffdc2885c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-20 17:44:41 +00:00
TreeHugger Robot
8200a1206d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-20 17:40:48 +00:00
TreeHugger Robot
e2a4f53119 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-20 17:34:58 +00:00
TreeHugger Robot
563df99655 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-20 17:34:08 +00:00
TreeHugger Robot
0748fe2254 Merge "Ignore the documentLaunchMode in testing" into sc-dev 2021-03-20 17:07:59 +00:00
Ruslan Tkhakokhov
e05824f661 Merge "Update BackupEligibilityRules" into sc-dev 2021-03-20 14:28:12 +00:00
Bill Yi
72ce1491e2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I50082aa0a66f1fdbcd1bc731892ec6111cd8e6b1
 2021-03-20 13:24:30 +00:00
Bill Yi
dede9994c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I46a9ab3303c0106ccb8c21cb4911e0d5d916e294
 2021-03-20 13:05:10 +00:00
Bill Yi
fc2c87d78c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I55f139f5a494d77768fa7b808a087ff9754bc90c
 2021-03-20 12:46:25 +00:00
Bill Yi
b65e29dfe4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4d3b9dbb96ea0bcb0bdfc5e83ae0fad68531c5a2
 2021-03-20 11:51:33 +00:00
Bill Yi
f8af11cd01 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibfe948ac82b41c118fde8f31bb1343d8d716e1b7
 2021-03-20 05:08:47 +00:00
Bill Yi
c3bced8654 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I672bdc26f142efa60862bb1472bd90b6c824c3f6
 2021-03-20 04:50:22 +00:00