Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
476,922 Commits 3 Branches 0 Tags
ac009ade580ef4e6527e95ecb8acde95fda02117
Commit Graph

476922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Mitchell
ac009ade58 Merge "Synchronize before calling unstableRemoveIf" into rvc-dev am: ad5a070a87 
Change-Id: I415b3511766737263102258000b4be147342171f
 2020-03-30 15:49:03 +00:00
TreeHugger Robot
3d830136da Merge "Update MediaRouter2Manager api" into rvc-dev am: bb138f21d7 
Change-Id: I773daf31de35fbf305a1343a50466e0f067afd8b
 2020-03-30 15:48:31 +00:00
Mingming Cai
9e5947d3c1 Merge "Add global cell ID to all technologies" into rvc-dev am: dc087115c8 
Change-Id: Ib24ebe1857a70b8e622ea4731c218fa9b32a5960
 2020-03-30 15:47:57 +00:00
Ryan Mitchell
ad5a070a87 Merge "Synchronize before calling unstableRemoveIf" into rvc-dev 2020-03-30 15:44:00 +00:00
TreeHugger Robot
bb138f21d7 Merge "Update MediaRouter2Manager api" into rvc-dev 2020-03-30 15:43:18 +00:00
Mingming Cai
dc087115c8 Merge "Add global cell ID to all technologies" into rvc-dev 2020-03-30 15:33:10 +00:00
Ben Murdoch
89c73b0c0e Merge "Add user switcher related strings to SettingsLib." into rvc-dev am: 66041721d7 
Change-Id: Ic72f136f671e364d25e9410a05136ac6b5535f54
 2020-03-30 15:14:04 +00:00
Fabian Kozynski
4f555f54e8 Merge "Remove unnecessary old code from test" into rvc-dev am: 4706134064 
Change-Id: Ib91ceebd90055cd09f29fe1b7f377408c3cbfeec
 2020-03-30 15:13:35 +00:00
Anton Hansson
b8420a16b3 [automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: d03b443e0f am: 632747c72e -s ours 
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 c868e77153 is in history

Change-Id: Ib1172487afd1fdfea82b83099ebfc60101afc6c0
 2020-03-30 15:10:56 +00:00
Anton Hansson
028f63b8c9 [automerger skipped] Merge "Build tethering against the module SDK" am: b4580f6294 am: 6e8f8cfb98 -s ours 
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 383321e9d5 is in history

Change-Id: I1f1e4179236397649989ed7bff24d99ed5bada6b
 2020-03-30 15:10:31 +00:00
Ben Murdoch
66041721d7 Merge "Add user switcher related strings to SettingsLib." into rvc-dev 2020-03-30 15:01:46 +00:00
Fabian Kozynski
4706134064 Merge "Remove unnecessary old code from test" into rvc-dev 2020-03-30 15:01:28 +00:00
Anton Hansson
632747c72e Merge "Make framework-tethering stubs use the new defaults" am: d03b443e0f 
Change-Id: I148fcec861b97fbead0884918bff4e1560fab23d
 2020-03-30 14:47:33 +00:00
Anton Hansson
6e8f8cfb98 Merge "Build tethering against the module SDK" am: b4580f6294 
Change-Id: If720371eac2acc92677a15f7c0c5ae55c84023a6
 2020-03-30 14:47:06 +00:00
Anton Hansson
d03b443e0f Merge "Make framework-tethering stubs use the new defaults" 2020-03-30 14:16:02 +00:00
Anton Hansson
b4580f6294 Merge "Build tethering against the module SDK" 2020-03-30 14:15:42 +00:00
Will Brockman
8dcdbd02ab Merge "Pull out library needed for Notification CTS test." into rvc-dev am: dce5a57376 
Change-Id: Id39bee70cc81a8340c22124175ea9d2b3c3a1a70
 2020-03-30 13:31:54 +00:00
Will Brockman
dce5a57376 Merge "Pull out library needed for Notification CTS test." into rvc-dev 2020-03-30 13:29:42 +00:00
TreeHugger Robot
02600a7c88 Merge changes I6f6b4d78,I874696cf into rvc-dev am: b7df0eb9a6 
Change-Id: Ic56a311ea4b54664eafcfc623580bcf30fc98bfb
 2020-03-30 13:25:27 +00:00
TreeHugger Robot
b7df0eb9a6 Merge changes I6f6b4d78,I874696cf into rvc-dev 
* changes:
  Only send reset state annotation when needed
  Group annotations for the same atom id
 2020-03-30 13:22:29 +00:00
Narayan Kamath
45f8d1cf43 Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev am: 924069c2aa 
Change-Id: Ieb278c96432a0a23d65752a2c89365b02ed936f4
 2020-03-30 13:22:15 +00:00
Narayan Kamath
924069c2aa Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev 2020-03-30 13:16:06 +00:00
TreeHugger Robot
ecfd2f5cb9 Merge "Dark Theme doesnt forget car changes" into rvc-dev am: 88973641ac 
Change-Id: I484221a76a5b570e83db6f179fdb7ab1169e460a
 2020-03-30 13:12:17 +00:00
Matt Pietal
a8a2247f9a Merge "Controls UI - Various header fixes" into rvc-dev am: c2b9794471 
Change-Id: Id8fc68fc201c6872c4f4172f00f51e407279f4e0
 2020-03-30 13:10:48 +00:00
TreeHugger Robot
88973641ac Merge "Dark Theme doesnt forget car changes" into rvc-dev 2020-03-30 13:09:59 +00:00
Matt Pietal
c2b9794471 Merge "Controls UI - Various header fixes" into rvc-dev 2020-03-30 12:57:30 +00:00
TreeHugger Robot
b2ea161c2d Merge "Fix flickers when changing control" into rvc-dev am: c322ed2173 
Change-Id: I2c211d58c0ecd562f7bf80a686cbd4a12bac0b9a
 2020-03-30 11:56:00 +00:00
TreeHugger Robot
c322ed2173 Merge "Fix flickers when changing control" into rvc-dev 2020-03-30 11:45:54 +00:00
TreeHugger Robot
e528b63957 Merge "Remove the @hide from ContextImpl#bindServiceAsUser" into rvc-dev am: 99960a5f79 
Change-Id: Ib08500fa9e663426ae118ceb2d59cb7678490c5e
 2020-03-30 10:53:44 +00:00
TreeHugger Robot
99960a5f79 Merge "Remove the @hide from ContextImpl#bindServiceAsUser" into rvc-dev 2020-03-30 10:41:33 +00:00
Stefano Galarraga
42ca2564e9 [automerger skipped] Merge "Add NNAPI processes to ANR" into rvc-dev am: 0501693a95 -s ours 
am skip reason: Change-Id I17eef38fda6332d5af4f2d946619a5a84c208c2d with SHA-1 c0c7afdcbb is in history

Change-Id: I8cfeb1bd696d3ea00a5f970f4a9b5d1a3857e6c8
 2020-03-30 10:01:32 +00:00
Stefano Galarraga
0501693a95 Merge "Add NNAPI processes to ANR" into rvc-dev 2020-03-30 09:42:22 +00:00
Chiachang Wang
4ef106c4fc Merge "Update constructor of NetworkMonitor" am: 2ec47eeb7c am: e33bba74fc 
Change-Id: I59f68083d374afc1d0bf38cc6abd5fe4cbe068d1
 2020-03-30 09:12:37 +00:00
JW Wang
cdc80e6ab4 Merge "Fix an NPE in WatchdogEventLogger#stop" into rvc-dev am: 1ad1f9938f 
Change-Id: I912195d949b5df261f876848fc828270146abbdf
 2020-03-30 09:05:46 +00:00
JW Wang
1ad1f9938f Merge "Fix an NPE in WatchdogEventLogger#stop" into rvc-dev 2020-03-30 09:03:27 +00:00
Rubin Xu
48ac87122d Merge "Only enforce secure FRP mode when in setup wizard" into rvc-dev am: c8983dbed7 
Change-Id: I2f3197af787604385fc58f500ac47bb2f6709ff2
 2020-03-30 09:01:30 +00:00
Rubin Xu
0a641bcba6 Merge "Restore password metrics after a credential-less unlock" into rvc-dev am: b9a49c8b46 
Change-Id: Ie2a17b8c61e10ed027897c054e6e3f5dd43dc27c
 2020-03-30 09:00:24 +00:00
Chiachang Wang
e33bba74fc Merge "Update constructor of NetworkMonitor" am: 2ec47eeb7c 
Change-Id: I5ef9b48946acb83ada644600117c604028a5c0b5
 2020-03-30 08:56:34 +00:00
Rubin Xu
c8983dbed7 Merge "Only enforce secure FRP mode when in setup wizard" into rvc-dev 2020-03-30 08:48:18 +00:00
Rubin Xu
b9a49c8b46 Merge "Restore password metrics after a credential-less unlock" into rvc-dev 2020-03-30 08:47:39 +00:00
Chiachang Wang
2ec47eeb7c Merge "Update constructor of NetworkMonitor" 2020-03-30 08:40:45 +00:00
Lucas Lin
bf31b2443a [automerger skipped] Merge "Fix NetworkCapabilitiesTest fail on Q device" am: 61265bffa1 am: 97e9679907 -s ours 
am skip reason: Change-Id I602ae32dae1ad29fe3293c541fa6d2cef01b81d3 with SHA-1 a1d1976449 is in history

Change-Id: Id82ae0b4426104a64758a9426e165d1c69087379
 2020-03-30 08:20:35 +00:00
Lucas Lin
97e9679907 Merge "Fix NetworkCapabilitiesTest fail on Q device" am: 61265bffa1 
Change-Id: I591b621bb8b659aa7d0c163b20d03952589db428
 2020-03-30 08:06:30 +00:00
Xiao Ma
440e851986 [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: 7410a9c352 -s ours 
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 7d51a72487 is in history

Change-Id: Ieb1ca59f2c72ac7ce731544cffeb8d48ad40561c
 2020-03-30 08:06:18 +00:00
Chiachang Wang
59ed66a8a5 Update constructor of NetworkMonitor 
Remove redundant parameter.

Bug: 152374582
Test: m -j40 ; atest FrameworksNetIntegrationTests
Change-Id: I3a636f0ea5145ac4435e06a9827bb8e01862542d
 2020-03-30 07:52:02 +00:00
Xiao Ma
7410a9c352 Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev 2020-03-30 07:46:30 +00:00
Lucas Lin
61265bffa1 Merge "Fix NetworkCapabilitiesTest fail on Q device" 2020-03-30 07:41:01 +00:00
TreeHugger Robot
08ab65e4d9 Merge "Fix DecorView error about non-visual context" into rvc-dev am: 8927986f3b 
Change-Id: I1d2a60061ee38fe9985c3a841d14e44e0729002f
 2020-03-30 07:37:47 +00:00
TreeHugger Robot
8927986f3b Merge "Fix DecorView error about non-visual context" into rvc-dev 2020-03-30 07:20:00 +00:00
Lorenzo Colitti
2f5ae9a250 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 -s ours 
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 e0b3b8785e is in history

Change-Id: Icb265e846177c8ee1013529034534f46dec4de47
 2020-03-30 07:06:45 +00:00