Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
473,156 Commits 3 Branches 0 Tags
3f018fc0341c8ca6cc0c404eef7052afb2e480ac
Commit Graph

473156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
3f018fc034 Merge "Move sensitive field parceling bool to constructor" am: ab5fdfa7cd am: 28c13929db 
Change-Id: Ice332671a4b97dad595c79c8c42ce47dca52b8e2
 2020-03-17 08:17:51 +00:00
Automerger Merge Worker
28c13929db Merge "Move sensitive field parceling bool to constructor" am: ab5fdfa7cd 
Change-Id: Ib5619a2173d838e81091415fe6323370f61c9461
 2020-03-17 08:05:40 +00:00
Remi NGUYEN VAN
ab5fdfa7cd Merge "Move sensitive field parceling bool to constructor" 2020-03-17 07:49:38 +00:00
Automerger Merge Worker
de9eced064 Merge "Enable wallpaper zoom" into rvc-dev am: 8888ec9144 
Change-Id: I6bda7aee4de59bb69bfe2df5d36cab3f67c25707
 2020-03-17 06:55:27 +00:00
Lucas Dupin
8888ec9144 Merge "Enable wallpaper zoom" into rvc-dev 2020-03-17 06:45:44 +00:00
Automerger Merge Worker
a021f250d6 Merge "Revert "Expose hidden resources used in telephony/common"" into rvc-dev am: b5e33cf663 
Change-Id: Ib3c53f03e6e0ab44d8efe12b94edd59dd913e5d8
 2020-03-17 05:58:51 +00:00
Sarah Chin
b5e33cf663 Merge "Revert "Expose hidden resources used in telephony/common"" into rvc-dev 2020-03-17 05:43:48 +00:00
Automerger Merge Worker
14b65fa846 [automerger skipped] Merge "Ensure that NetworkFactory objects cannot be reused." am: bfa98e9655 am: fa6093de14 -s ours 
am skip reason: Change-Id I793436ee0f4b5d778788ad34b8a2575d2ad0ed80 with SHA-1 f1080a9a79 is in history

Change-Id: I5672bf0133a8fa10a8d8332367d6a6fc046071e8
 2020-03-17 05:19:06 +00:00
Automerger Merge Worker
fa6093de14 Merge "Ensure that NetworkFactory objects cannot be reused." am: bfa98e9655 
Change-Id: Ifc5cac306f1558c8560f1829eea538fe9a395b26
 2020-03-17 04:55:06 +00:00
Automerger Merge Worker
18bb1ac59e [automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 389714de44 -s ours 
am skip reason: Change-Id Iecf65859cdeeaac2fa7b817b4f505c510424ac89 with SHA-1 54f353e693 is in history

Change-Id: I9796cca859f19631e764651a954f10f751b24c39
 2020-03-17 04:51:46 +00:00
Automerger Merge Worker
8e322629db Merge "Fixing how SIDs are added to keys during generation time" into rvc-dev am: 1149789be5 
Change-Id: I406e958372dda849a40d4995588a37ebc5968057
 2020-03-17 04:51:32 +00:00
Automerger Merge Worker
3bb4cf9496 [automerger skipped] Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" into rvc-dev am: 19f09b234a -s ours 
am skip reason: Change-Id Ib9df71192937164ff95ce564195d5d68508ec69d with SHA-1 86e560c749 is in history

Change-Id: I63c230e9a981496f92bb15731edd514292bb4ba2
 2020-03-17 04:51:18 +00:00
Automerger Merge Worker
7d4c6ccfb2 Merge "Convert system forced reasons to flags." into rvc-dev am: e78f4abb70 
Change-Id: I7be63b638d06ca0081c4dcc5adb66b1b482078af
 2020-03-17 04:51:08 +00:00
Automerger Merge Worker
694fcdfc0e Merge "Ensure prediction can remove from RESTRICTED timeout." into rvc-dev am: 493498d7c6 
Change-Id: I66a08f932412ba019be38a2c2b36629113f2978c
 2020-03-17 04:50:37 +00:00
Automerger Merge Worker
1d538b0e3b Merge "Stop listening to POWER_SAVE_MODE_CHANGING broadcast." into rvc-dev am: add24612f4 
Change-Id: I26b0dfd0a434ef1c7dc9b9f91b3236d4a1b75394
 2020-03-17 04:50:18 +00:00
Remi NGUYEN VAN
389714de44 Merge "Cleanup the TetheredClients API" into rvc-dev 2020-03-17 04:49:06 +00:00
TreeHugger Robot
1149789be5 Merge "Fixing how SIDs are added to keys during generation time" into rvc-dev 2020-03-17 04:42:55 +00:00
Lucas Lin
19f09b234a Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" into rvc-dev 2020-03-17 04:42:52 +00:00
Lorenzo Colitti
bfa98e9655 Merge "Ensure that NetworkFactory objects cannot be reused." 2020-03-17 04:35:01 +00:00
Kweku Adams
e78f4abb70 Merge "Convert system forced reasons to flags." into rvc-dev 2020-03-17 04:28:24 +00:00
Kweku Adams
493498d7c6 Merge "Ensure prediction can remove from RESTRICTED timeout." into rvc-dev 2020-03-17 04:27:43 +00:00
Kweku Adams
add24612f4 Merge "Stop listening to POWER_SAVE_MODE_CHANGING broadcast." into rvc-dev 2020-03-17 04:26:37 +00:00
Automerger Merge Worker
dd1a44be9d Merge "Use the bounds received in taskAppeared" into rvc-dev am: 3b1bdd37a2 
Change-Id: Idea748909a164730550dd8b2fb7a91682e7a4d5d
 2020-03-17 04:18:31 +00:00
Automerger Merge Worker
ff71e5a6d4 Merge "Fix issue where blurs would get stuck" into rvc-dev am: 13dcbd321a 
Change-Id: I1467de52a7ad396153419e42b4413346e23edb78
 2020-03-17 04:17:54 +00:00
Lucas Dupin
44cdbbd597 Enable wallpaper zoom 
Test: manual
Bug: 149792636
Bug: 146387434
Change-Id: I95f175563395db7ac2ad9843cb34a3128bd74c33
 2020-03-16 21:08:46 -07:00
Hongwei Wang
3b1bdd37a2 Merge "Use the bounds received in taskAppeared" into rvc-dev 2020-03-17 04:07:00 +00:00
Lucas Dupin
13dcbd321a Merge "Fix issue where blurs would get stuck" into rvc-dev 2020-03-17 04:04:40 +00:00
Automerger Merge Worker
2e15aca531 [automerger skipped] Merge "Removed permission check" am: d5848b795d am: 3e2c2b3293 -s ours 
am skip reason: Change-Id I68833fdf6f078d69bc8c2e5f01cf4e058d6d7093 with SHA-1 0b9a12c2c4 is in history

Change-Id: I2f8c65301b70db5a8b0e86396e7b47512c328bbe
 2020-03-17 04:04:22 +00:00
Automerger Merge Worker
3e2c2b3293 Merge "Removed permission check" am: d5848b795d 
Change-Id: Ie2be66f408e4a4591c087a785ae749924816bdd2
 2020-03-17 03:46:21 +00:00
Automerger Merge Worker
74fafd3174 Merge "Keep window expanded when blurring it" into rvc-dev am: 60c9fcad57 
Change-Id: Ic952cf8dd4fc5bdaa4ee4d8e357a693c0e6093a2
 2020-03-17 03:38:42 +00:00
Lucas Dupin
60c9fcad57 Merge "Keep window expanded when blurring it" into rvc-dev 2020-03-17 03:26:23 +00:00
Automerger Merge Worker
51abef39d8 Merge "Makes the finger-to-cursor distance configurable via DeviceConfig." into rvc-dev am: 422e7eada2 
Change-Id: I27f24cdcd4148bac51850c7d4804cf7a8aa46202
 2020-03-17 03:23:44 +00:00
Shu Chen
422e7eada2 Merge "Makes the finger-to-cursor distance configurable via DeviceConfig." into rvc-dev 2020-03-17 03:18:55 +00:00
Automerger Merge Worker
b52593c579 Merge "Run codegen v15 on inline suggestion data classes" into rvc-dev am: f931471bf4 
Change-Id: I2db02d6bd90c071443781c6b6e3dfafc9d1ca039
 2020-03-17 03:17:48 +00:00
Automerger Merge Worker
3a79af29c6 Merge "Revert "Enable settings_tether_all_in_one by default"" into rvc-dev am: 7cff642925 
Change-Id: I6a6dedd516437c3e513181fc1d21f1bea4052c6d
 2020-03-17 03:16:20 +00:00
Jack Yu
d5848b795d Merge "Removed permission check" 2020-03-17 03:15:32 +00:00
TreeHugger Robot
f931471bf4 Merge "Run codegen v15 on inline suggestion data classes" into rvc-dev 2020-03-17 03:13:25 +00:00
Rajeev Kumar
7cff642925 Merge "Revert "Enable settings_tether_all_in_one by default"" into rvc-dev 2020-03-17 03:09:23 +00:00
Automerger Merge Worker
e0c2dbaa5c Merge "upperLayerIndicator_r15 is optional, nr state design changed" into rvc-dev am: 6e6e233019 
Change-Id: Ifcbf9f227bd65be8378aa7e842d9dd2543f78c4d
 2020-03-17 03:06:09 +00:00
Automerger Merge Worker
efddc855b3 [automerger skipped] Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" am: 1724914c9f am: 42f970358d -s ours 
am skip reason: Change-Id I62a0249a1462c9e8d71552e2304642eb6bde3eb5 with SHA-1 7c626cb897 is in history

Change-Id: Ibe2154cf89bcbaa891340a96858ff3954e37e8bf
 2020-03-17 03:05:52 +00:00
Automerger Merge Worker
64c988eb9d Merge "Make LinkPropertiesTest backwards compatible" am: 9b6ddfb5b8 am: 2a22fe993b 
Change-Id: Ie1db141b72770490632c3974b904ee9b1438922e
 2020-03-17 03:05:25 +00:00
Max Bires
1cfd95ec0c Fixing how SIDs are added to keys during generation time 
SIDs were not being properly applied to key parameters under the new
authentication rework. Now that biometric/credential unlocks are valid
for either auth-per-op or timeout auth bound keys, the SIDs need to be
tacked on appropriately in each authentication flow.

Bug: 148425329
Test: CtsVerifier
Change-Id: I73733b00d2da5ac78db6d77c53de144f4473bb54
 2020-03-17 02:57:36 +00:00
SongFerng Wang
6e6e233019 Merge "upperLayerIndicator_r15 is optional, nr state design changed" into rvc-dev 2020-03-17 02:57:14 +00:00
Automerger Merge Worker
42f970358d Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" am: 1724914c9f 
Change-Id: I2b127f762d671c4f7599b0b0b853e9bbc3c18dfd
 2020-03-17 02:49:09 +00:00
Automerger Merge Worker
6399b109bb [automerger skipped] Merge "Visualizer: Fix race condition in setCaptureCallBack" into rvc-dev am: 5e0373b847 -s ours 
am skip reason: Change-Id Iaea62a0e2f7e7a996c1554b9ed89efb67fbdfc11 with SHA-1 61c109cc7c is in history

Change-Id: Id2c91f13d4af1b7290b82ca1b5eea062484d336a
 2020-03-17 02:48:31 +00:00
Automerger Merge Worker
2a22fe993b Merge "Make LinkPropertiesTest backwards compatible" am: 9b6ddfb5b8 
Change-Id: Iedcb704eba4a342058a7b6fdea3f1bd83dec4744
 2020-03-17 02:48:05 +00:00
Automerger Merge Worker
1c8dcd0a8f Merge changes from topic "150757314" into rvc-dev am: 07dbadcd14 
Change-Id: I23bb00b615bd95e6b88af5c34dd136a9f7d20e61
 2020-03-17 02:47:50 +00:00
TreeHugger Robot
5e0373b847 Merge "Visualizer: Fix race condition in setCaptureCallBack" into rvc-dev 2020-03-17 02:47:04 +00:00
Zoey Chen
1724914c9f Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" 2020-03-17 02:45:25 +00:00
Automerger Merge Worker
a3630a528f Add some comments in isAlwaysOnVpnLockdownEnabled 
Bug: 141621373
Test: Build pass.

Change-Id: Ie063d9ad35fd703ad376e993345e7158c6082b87
Merged-In: Ib9df71192937164ff95ce564195d5d68508ec69d
 2020-03-17 02:43:49 +00:00