Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
453,129 Commits 3 Branches 0 Tags
bb3c7ac3dec8601e7ba36de296256be9ddf0ab40
Commit Graph

453129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Lin
bb3c7ac3de Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN" am: 82f0c22598 am: 124bb5c9ff 
am: 5e5ac63f3c

Change-Id: I9539e73842040e3a38a64c4b4863adfe32c893e9
 2019-11-25 10:33:04 -08:00
Roshan Pius
9f15d13d4c [automerger skipped] Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module" am: 5b57190f08 am: 0564779e76 
am: 126fb85c29 -s ours
am skip reason: change_id Id5a66189150e7a088127519373a832f63bdd12ac with SHA1 c278f80c28 is in history

Change-Id: I3e9ab075b8228250bf59fc54c5d12f977c686861
 2019-11-25 10:30:10 -08:00
Paul Mclean
51043f921c Merge "Hide "Always Allow" UI for USB warning instances." 2019-11-25 18:24:20 +00:00
Android Build Merger (Role)
19cc24da7a Merge changes from topic "am-551fb4ad91ea487f8283d44e5a3c01a2" 
* changes:
  [automerger skipped] Merge changes from topic "migrate_CtsStagedInstallTest_RollbackTest" am: 63e6d6af01 am: 00190cf8a6 am: c376fb681c -s ours am skip reason: change_id I5e5c154758b3f0e4731696c813519ac798fbbae9 with SHA1 a859e8affc is in history
  [automerger skipped] Increase timeout in testNativeWatchdogTriggersRollback am: 5f01cb9246 am: 5a6df15108 am: 3a86bceed3 -s ours am skip reason: change_id I2a98e71102fc1cbf6ea712e070d6db49cdb05cba with SHA1 56d58a0493 is in history
  [automerger skipped] Fix flaky testEnableRollbackTimeoutFailsRollback test am: 1d66bf8c48 am: 79e8fcb4ae am: 4371b2a00e -s ours am skip reason: change_id Id94d5452836b07d6f802758bd0dfdd3c276a3c05 with SHA1 b61fac95f5 is in history
  [automerger skipped] Wait for available rollbacks in RollbackTest. am: 77a40731f8 am: 170a519878 am: 129a2c09ac -s ours am skip reason: change_id I27e2513b34f49af2f41cd627a5d2550541831e11 with SHA1 0a3c06e9c9 is in history
  [automerger skipped] Include NewRollbacks in result of getAvailableRollbacks. am: dc4a36105b am: b63dfa2d3b am: eb559106bd -s ours am skip reason: change_id I015ee5925e38118c40f4b9e145f78fb12c0e2890 with SHA1 0672808c27 is in history
  [automerger skipped] Rename RollbackData to Rollback. am: 91fc4db14e am: b646e555e8 am: d0d7a014c3 -s ours am skip reason: change_id I5ae3866753d6badcdf019525b40522937568dee5 with SHA1 8d512eeb95 is in history
  [automerger skipped] Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK. am: 87a504d1fc am: 682e501c2a am: ab81c07bb0 -s ours am skip reason: change_id Iffd63977a7498e3cba20d2039af623c921d38f57 with SHA1 48f3cf476c is in history
  [automerger skipped] Update to new RollbackUtils.sendCrashBroadcast API. am: 3e7ef5ae0b am: a39bd708e4 am: 6ff24063ff -s ours am skip reason: change_id Iaaa728aa58d894ba546677e8295faba2ebfc5e64 with SHA1 0c03aaae84 is in history
  [automerger skipped] Extend ROLLBACK_COMMITTED broadcast for the multi-user case am: e92720ddb9 am: 4bcb79bb71 am: e243c75188 -s ours am skip reason: change_id I8e20da321f52ebf9e6d584a8c59d2a3106a32212 with SHA1 65e90bab69 is in history
  [automerger skipped] Fix NullPointerException. am: b4bad064d8 -s ours am: d0654a76f3 -s ours am: 21640f381f -s ours am skip reason: change_id Ic007e44264647793c6271c3923c13c9e1736a9de with SHA1 17bfed91cc is in history
  [automerger skipped] Cleanup some obsolete TODOs and unused code. am: cda1a17516 am: 01178b4f9d am: 38467d7eef -s ours am skip reason: change_id I67610d3467d737cbfc085f00ea0b509b63f4612b with SHA1 d006f75672 is in history
 2019-11-25 18:21:22 +00:00
Bill Lin
eea2494645 [automerger skipped] Merge changes from topic "migrate_CtsStagedInstallTest_RollbackTest" am: 63e6d6af01 am: 00190cf8a6 
am: c376fb681c -s ours
am skip reason: change_id I5e5c154758b3f0e4731696c813519ac798fbbae9 with SHA1 a859e8affc is in history

Change-Id: Iffdd080e4df502f1721cdfd72d9a924cac0ddbe2
 2019-11-25 10:19:13 -08:00
Richard Uhler
2b8d4fe34c [automerger skipped] Increase timeout in testNativeWatchdogTriggersRollback am: 5f01cb9246 am: 5a6df15108 
am: 3a86bceed3 -s ours
am skip reason: change_id I2a98e71102fc1cbf6ea712e070d6db49cdb05cba with SHA1 56d58a0493 is in history

Change-Id: I15aadac8e470a4271d266a4d56e353420fd595c3
 2019-11-25 10:19:06 -08:00
Richard Uhler
af74fb0b30 [automerger skipped] Fix flaky testEnableRollbackTimeoutFailsRollback test am: 1d66bf8c48 am: 79e8fcb4ae 
am: 4371b2a00e -s ours
am skip reason: change_id Id94d5452836b07d6f802758bd0dfdd3c276a3c05 with SHA1 b61fac95f5 is in history

Change-Id: I91290cbc6c96dc620d64ef18c0e80a2da049b0a5
 2019-11-25 10:19:00 -08:00
Oli Lan
24fc96b79d [automerger skipped] Wait for available rollbacks in RollbackTest. am: 77a40731f8 am: 170a519878 
am: 129a2c09ac -s ours
am skip reason: change_id I27e2513b34f49af2f41cd627a5d2550541831e11 with SHA1 0a3c06e9c9 is in history

Change-Id: I20a737c4da3e8ad730a24fa9c2764bd38325a144
 2019-11-25 10:18:53 -08:00
Oli Lan
d73011d613 [automerger skipped] Include NewRollbacks in result of getAvailableRollbacks. am: dc4a36105b am: b63dfa2d3b 
am: eb559106bd -s ours
am skip reason: change_id I015ee5925e38118c40f4b9e145f78fb12c0e2890 with SHA1 0672808c27 is in history

Change-Id: I241b376a6ff92e14e9487c7cc560c1d258e4588d
 2019-11-25 10:18:46 -08:00
Richard Uhler
442d1e0db2 [automerger skipped] Rename RollbackData to Rollback. am: 91fc4db14e am: b646e555e8 
am: d0d7a014c3 -s ours
am skip reason: change_id I5ae3866753d6badcdf019525b40522937568dee5 with SHA1 8d512eeb95 is in history

Change-Id: I3868320800f49610eb2a9b6eb782fc9f231f1924
 2019-11-25 10:18:40 -08:00
Oli Lan
b8d6525025 [automerger skipped] Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK. am: 87a504d1fc am: 682e501c2a 
am: ab81c07bb0 -s ours
am skip reason: change_id Iffd63977a7498e3cba20d2039af623c921d38f57 with SHA1 48f3cf476c is in history

Change-Id: I3f70504b0e7383c27379a77bf72dcc4fc4fd4b67
 2019-11-25 10:18:34 -08:00
Richard Uhler
0addeb7809 [automerger skipped] Update to new RollbackUtils.sendCrashBroadcast API. am: 3e7ef5ae0b am: a39bd708e4 
am: 6ff24063ff -s ours
am skip reason: change_id Iaaa728aa58d894ba546677e8295faba2ebfc5e64 with SHA1 0c03aaae84 is in history

Change-Id: If99e3a0757c8eaaf004a6155134d9242ea29abd8
 2019-11-25 10:18:27 -08:00
Gavin Corkery
3dbb2e3cc2 [automerger skipped] Extend ROLLBACK_COMMITTED broadcast for the multi-user case am: e92720ddb9 am: 4bcb79bb71 
am: e243c75188 -s ours
am skip reason: change_id I8e20da321f52ebf9e6d584a8c59d2a3106a32212 with SHA1 65e90bab69 is in history

Change-Id: I78db0d8f756c86409a4b780c1942b14cce056e84
 2019-11-25 10:18:19 -08:00
Tomasz Wasilczyk
896d585ddd Merge "Allow null TransmitPowerRange ctor argument for ModemActivityInfo" 2019-11-25 18:18:17 +00:00
Richard Uhler
9b0ed230f3 [automerger skipped] Fix NullPointerException. am: b4bad064d8 -s ours am: d0654a76f3 -s ours 
am: 21640f381f -s ours
am skip reason: change_id Ic007e44264647793c6271c3923c13c9e1736a9de with SHA1 17bfed91cc is in history

Change-Id: Ibd1dc1c5eca49cd0261693018598a6df2983eeed
 2019-11-25 10:18:13 -08:00
Richard Uhler
fedd3609ad [automerger skipped] Cleanup some obsolete TODOs and unused code. am: cda1a17516 am: 01178b4f9d 
am: 38467d7eef -s ours
am skip reason: change_id I67610d3467d737cbfc085f00ea0b509b63f4612b with SHA1 d006f75672 is in history

Change-Id: Idb4e2d707afa8cad184f035e223be6398d450ef2
 2019-11-25 10:17:54 -08:00
Mathieu Chartier
d74687f679 Merge "Pass runtimeFlags to postForkSystemServer" 2019-11-25 18:06:51 +00:00
Roshan Pius
40ff6d65cc Merge "Revert "privapps-permission: Make REQUEST_NETWORK_SCORES a privilged permission"" 2019-11-25 17:34:36 +00:00
Mohammad Samiul Islam
820b1e244c Merge "Allow StagingManager to abort individual staged session" 2019-11-25 17:32:54 +00:00
Heemin Seog
0d96dc184d Merge "Rearrange listener logic so it can be overriden" 2019-11-25 17:10:05 +00:00
Daniel Sandler
0fc0ed81cf [automerger skipped] Merge "Action chips in share sheet. (DO NOT MERGE)" into qt-qpr1-dev am: 3b179167af 
am: 41ee7fa049 -s ours
am skip reason: subject contains skip directive

Change-Id: I9b8f5df7d80cec3778c7f481709dd1f933cd7ad8
 2019-11-25 08:34:44 -08:00
Dan Sandler
d9138fd28a [automerger skipped] Action chips in share sheet. (DO NOT MERGE) am: 0d3e358628 
am: 486ad0d659 -s ours
am skip reason: subject contains skip directive

Change-Id: I85221eeecbca0692ea4ae215fc0d9b20c4bd57ea
 2019-11-25 08:31:50 -08:00
Mayank Garg
3348312d53 Car user switching dialog taking more than 3 seconds am: 3629c607f0 
am: b38ca0add7

Change-Id: I7e075de565860e4c34b21c24d08bdfdc923206cd
 2019-11-25 08:28:03 -08:00
Linus Tufvesson
526acdc987 Merge "Only apply flag when it has been changed" 2019-11-25 16:26:24 +00:00
paulhu
c77e7fcd9a Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService" am: a150138e67 am: 773a92edb9 
am: e54bdb979d

Change-Id: I0d50f6bccc9fb18a54865b45a7e8d1eaff01ea9e
 2019-11-25 08:23:23 -08:00
Xin Li
3422b778f9 [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master am: 4623c35f07 -s ours 
am: dfb66cca22 -s ours
am skip reason: subject contains skip directive

Change-Id: I1cf1feb2a0c8a9d17963643a9c23cfdacd31e73a
 2019-11-25 08:09:14 -08:00
Android Build Merger (Role)
531f5b993d Merge "[automerger skipped] DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master am: 9ae3822f83 -s ours am: 698f511333 -s ours am skip reason: subject contains skip directive" 2019-11-25 15:55:34 +00:00
Xin Li
9002055cfe [automerger skipped] DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master am: 9ae3822f83 -s ours 
am: 698f511333 -s ours
am skip reason: subject contains skip directive

Change-Id: I829be917d0a3e77ad50c2c548b72da0229dc0c73
 2019-11-25 07:51:27 -08:00
Android Build Merger (Role)
647855de0a Merge "Merge "Always ask vold to unlock user" am: 62cec10872 am: e30f164dcc am: 50a47e61aa" 2019-11-25 15:50:28 +00:00
Nikita Ioffe
c4ca0d0cd9 Merge "Always ask vold to unlock user" am: 62cec10872 am: e30f164dcc 
am: 50a47e61aa

Change-Id: I971a7331aa4c1df805d4875dbe663bd018d3a56e
 2019-11-25 07:50:00 -08:00
Android Build Merger (Role)
cccd5ae178 Merge changes from topic "am-889d5ea693c047c5be9c863bba2ec84e" 
* changes:
  Merge "Add IKE to allowable zygote paths" am: 99e1e2812f am: 28ee420e5c am: 5e4beca11c
  Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig" am: 091e420529 am: bf9172deb4 am: d8dbd83e6d
  Expose IKE module API: Session Options & EapSessionConfig am: 39202c84a1 am: 1230075676 am: 85cd7d9bc8
  Expose IKE module API: IkeException, configuration & callback am: c4a5883fc5 am: 4e19cf4738 am: 68a828daca
  Expose IKE module API: IKE ID, TS and SaProposal am: 69d77da91a am: 327e0fcecc am: 171bf87879
 2019-11-25 15:48:16 +00:00
Benedict Wong
846481d38c Merge "Add IKE to allowable zygote paths" am: 99e1e2812f am: 28ee420e5c 
am: 5e4beca11c

Change-Id: I1cf60a2252d877b594886693125cd9b349d4cd74
 2019-11-25 07:39:10 -08:00
Benedict Wong
76182b50f3 Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig" am: 091e420529 am: bf9172deb4 
am: d8dbd83e6d

Change-Id: Ibe3c628fd6b3449c22be9e101dec6aeb1cb23895
 2019-11-25 07:39:05 -08:00
evitayan
49d64ab74e Expose IKE module API: Session Options & EapSessionConfig am: 39202c84a1 am: 1230075676 
am: 85cd7d9bc8

Change-Id: Id0697503d3ea3315bb6c9ab44b9c4bcf34af16d3
 2019-11-25 07:38:59 -08:00
evitayan
c73d2ffdac Expose IKE module API: IkeException, configuration & callback am: c4a5883fc5 am: 4e19cf4738 
am: 68a828daca

Change-Id: I5cf175934bd994661429cad6c0666999d30d11ae
 2019-11-25 07:38:54 -08:00
evitayan
82d1e1414d Expose IKE module API: IKE ID, TS and SaProposal am: 69d77da91a am: 327e0fcecc 
am: 171bf87879

Change-Id: I72e8f88adb2abf875eb97a3e248b8de019dcf846
 2019-11-25 07:38:48 -08:00
Android Build Merger (Role)
f22f42cb03 Merge "Merge "Clean up RLog usage" am: 3d0a47e717 am: fc5d525ff6 am: 1f65f27723" 2019-11-25 15:37:24 +00:00
Meng Wang
ded4b2e060 Merge "Clean up RLog usage" am: 3d0a47e717 am: fc5d525ff6 
am: 1f65f27723

Change-Id: I1b2995172690f586f6d8fc73f83cb2c0b46177b0
 2019-11-25 07:36:59 -08:00
Android Build Merger (Role)
5d432b5afb Merge "[automerger skipped] Merge "Add NR to CellInfo" am: 35cf55c4eb am: ad7bacce36 am: e068056cf4 -s ours am skip reason: change_id I9a34b57cebddb3be810b86080aff1022557c4c24 with SHA1 b2edb53b7d is in history" 2019-11-25 15:36:52 +00:00
Sarah Chin
571368bbd6 [automerger skipped] Merge "Add NR to CellInfo" am: 35cf55c4eb am: ad7bacce36 
am: e068056cf4 -s ours
am skip reason: change_id I9a34b57cebddb3be810b86080aff1022557c4c24 with SHA1 b2edb53b7d is in history

Change-Id: I4c0652c3e5225b5dd1fbd4d98e2d5187a0f4f22f
 2019-11-25 07:35:51 -08:00
Android Build Merger (Role)
29a2d2b5bf Merge "[automerger skipped] Merge "Fix system UI break in some devices" am: 19788abedd am: 6add1afd83 am: 1a76e63ac3 -s ours am skip reason: change_id I08f77a6507edc076758d53f051fadd60fa6c8f9d with SHA1 8d8c3b7aad is in history" 2019-11-25 15:35:44 +00:00
Greg Kaiser
a6d4211465 [automerger skipped] Merge "Fix system UI break in some devices" am: 19788abedd am: 6add1afd83 
am: 1a76e63ac3 -s ours
am skip reason: change_id I08f77a6507edc076758d53f051fadd60fa6c8f9d with SHA1 8d8c3b7aad is in history

Change-Id: I56307bf9a66873172e1137517559a38028276156
 2019-11-25 07:35:16 -08:00
Android Build Merger (Role)
ea4ab86f9c Merge "[automerger skipped] Merge "Fixes usage of WallpaperManager to make it optional." into qt-qpr1-dev am: 659f477f65 am: 5c9f648edd -s ours am skip reason: change_id I88946f92ff54e556d289c41c28e22da3a4b8c8b8 with SHA1 34a861add1 is in history" 2019-11-25 15:35:07 +00:00
Felipe Leme
e6696f9c76 [automerger skipped] Merge "Fixes usage of WallpaperManager to make it optional." into qt-qpr1-dev am: 659f477f65 
am: 5c9f648edd -s ours
am skip reason: change_id I88946f92ff54e556d289c41c28e22da3a4b8c8b8 with SHA1 34a861add1 is in history

Change-Id: I73352c6ab78be950a531a526c81b022bd92d3154
 2019-11-25 07:33:57 -08:00
Android Build Merger (Role)
a99a04b7f9 Merge "Merge "Deprecate FileUtils.closeQuietly" am: e4b84f3475 am: 769cf05c56 am: 17fac19d82" 2019-11-25 15:33:40 +00:00
Charles Munger
ccce5e7915 Merge "Deprecate FileUtils.closeQuietly" am: e4b84f3475 am: 769cf05c56 
am: 17fac19d82

Change-Id: Iccafa4d1eda9861d99f80f90652b87833387f571
 2019-11-25 07:33:11 -08:00
Android Build Merger (Role)
97a9da556f Merge "[automerger skipped] Merge "Revert "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views"" into qt-qpr1-dev am: 348a0fe87a am: 5298555797 -s ours am skip reason: subject contains skip directive" 2019-11-25 15:33:04 +00:00
Jian-Yang Liu
3e740519a5 [automerger skipped] Merge "Revert "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views"" into qt-qpr1-dev am: 348a0fe87a 
am: 5298555797 -s ours
am skip reason: subject contains skip directive

Change-Id: I9f6325f83c88e2a1d1a12c33c8dd9210fcefaa6e
 2019-11-25 07:32:39 -08:00
Android Build Merger (Role)
e438a1e835 Merge "[automerger skipped] Revert "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views" am: 5c2a6ca45a am: 4f4f7eeff0 -s ours am skip reason: subject contains skip directive" 2019-11-25 15:32:35 +00:00
Jian-Yang Liu
68c553a75d [automerger skipped] Revert "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views" am: 5c2a6ca45a 
am: 4f4f7eeff0 -s ours
am skip reason: subject contains skip directive

Change-Id: I66c8b79dfad43683bf5b6087577c19826d86e348
 2019-11-25 07:32:05 -08:00