Commit Graph

444501 Commits

Author SHA1 Message Date
Automerger Merge Worker
be9624a8e6 Merge "Protect ConnectivityService from SecurityException in permission check." am: 4637a72f05
Change-Id: I30d993e431b9d6486dcaebdc48c525a861301f70
2020-03-16 14:47:49 +00:00
Cody Kesting
4637a72f05 Merge "Protect ConnectivityService from SecurityException in permission check." 2020-03-16 14:33:25 +00:00
Automerger Merge Worker
16e7eb9224 Merge changes I801ddc49,Id1b8f41b am: ba350f4652
Change-Id: I604bcfab22d7b26b84bf126d02d9be612fcb6d29
2020-03-16 11:41:19 +00:00
Automerger Merge Worker
e761439fed Merge "[TelephonyMainline] @hide system api since we'll revisit in S - Cdma" am: eff8e993c7
Change-Id: Ibca9d8e88989e028aee1ba00b0dbac0cab2c307d
2020-03-16 11:40:55 +00:00
Treehugger Robot
ba350f4652 Merge changes I801ddc49,Id1b8f41b
* changes:
  [SP24] Rename functions that add Entry unconditionally
  [SP23] Address misc API review comment about NetworkStats
2020-03-16 11:38:00 +00:00
Zoey Chen
eff8e993c7 Merge "[TelephonyMainline] @hide system api since we'll revisit in S - Cdma" 2020-03-16 11:27:42 +00:00
Automerger Merge Worker
288837ff3d Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" am: 4db4933c81
Change-Id: Ia04a9aebfb7cce94f72f883da9388dadc4ac2ba9
2020-03-16 10:18:44 +00:00
Lucas Lin
4db4933c81 Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" 2020-03-16 10:08:51 +00:00
Automerger Merge Worker
c9d416f728 Merge "Fix typo in aosp/1242602" am: 1ae5516429
Change-Id: Ie617874be311e84e04d889f6c2069c77c25150b7
2020-03-16 08:36:03 +00:00
Automerger Merge Worker
1679129cff Merge "Remove UnixChannelFactory from preloaded-classes-blacklist" am: 620b85ae10
Change-Id: Iaf55b8ec446303181cddba10e625f63050a031ea
2020-03-16 08:35:12 +00:00
Treehugger Robot
1ae5516429 Merge "Fix typo in aosp/1242602" 2020-03-16 08:34:34 +00:00
Orion Hodson
620b85ae10 Merge "Remove UnixChannelFactory from preloaded-classes-blacklist" 2020-03-16 08:20:32 +00:00
junyulai
42f2754ba8 Fix typo in aosp/1242602
Test: m -j
Bug: 149652079
Change-Id: Ie023c8371785fc239c54eacbf056141c2e9e3444
2020-03-16 15:00:24 +08:00
junyulai
fd661f5db8 [SP24] Rename functions that add Entry unconditionally
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.

Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record unconditionally,
name them insertEntry.
  setIfaceValues -> insertEntry
  addEntry -> insertEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: I801ddc49e283a254b9586700c9b597c0adb0d459
2020-03-16 14:27:45 +08:00
junyulai
c7e614d0f3 [SP23] Address misc API review comment about NetworkStats
This change add several javadoc for NetworkStats and its Entry
class. Also remove IFACE_ALL constant accordlingly.

Test: atest FrameworkNetTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: Id1b8f41be79f847ad73197ff0e18258b6ee8a730
2020-03-16 14:27:45 +08:00
zoey chen
b81b4e5cd8 [TelephonyMainline] @hide system api since we'll revisit in S - Cdma
Test: make
Bug: 148404061
Change-Id: I83dbaa24f94f5cca846d6ca71c7e6814ecd832b8
Merged-In: I83dbaa24f94f5cca846d6ca71c7e6814ecd832b8
2020-03-16 05:48:10 +00:00
Automerger Merge Worker
34c9af30f9 Merge "Change TetheringConstants class to final" am: 2f92c8d46c
Change-Id: I3446ad5a368b9f127066ba1e133a7191afe80c2b
2020-03-16 05:33:55 +00:00
Mark Chien
2f92c8d46c Merge "Change TetheringConstants class to final" 2020-03-16 05:25:40 +00:00
Automerger Merge Worker
5712346e08 Merge "Give tethering bluetooth privilege permission" am: 5d734eec01
Change-Id: I4410ec8ae4331b663fe22edfd2705e3126ae1d82
2020-03-16 04:48:50 +00:00
Automerger Merge Worker
9613717da2 Merge "USB: Add OWNERS for USB functionality" am: cc13533098
Change-Id: Ib0602002f63b71d12bd1c646892927c1cc523193
2020-03-16 04:48:24 +00:00
Mark Chien
5d734eec01 Merge "Give tethering bluetooth privilege permission" 2020-03-16 04:46:44 +00:00
Treehugger Robot
cc13533098 Merge "USB: Add OWNERS for USB functionality" 2020-03-16 04:30:34 +00:00
Automerger Merge Worker
fdbc8bc485 Merge "[SP21] Address comments for API council review about aosp/1172143" am: 240f5bb4e9
Change-Id: Ief866c87b9e69b892fca435e8555080ffdad4af7
2020-03-16 03:05:06 +00:00
Automerger Merge Worker
be7c895514 Merge "Cleanup the TetheredClients API" am: 89711eaefe
Change-Id: I3aa44ae9b4d9ec5c34bca067d1ec2486d9dbb2c0
2020-03-16 03:04:26 +00:00
Automerger Merge Worker
c13c880914 [SP21] Address comments for API council review about aosp/1172143 am: 393e10d4cd
Change-Id: I8634d6f6ed65ec6b10009a90b147881fe1fc4530
2020-03-16 03:03:51 +00:00
Junyu Lai
240f5bb4e9 Merge "[SP21] Address comments for API council review about aosp/1172143" 2020-03-16 02:41:19 +00:00
Remi NGUYEN VAN
89711eaefe Merge "Cleanup the TetheredClients API" 2020-03-16 02:37:20 +00:00
lucaslin
86e560c749 Add some comments in isAlwaysOnVpnLockdownEnabled
Bug: 141621373
Test: Build pass.
Change-Id: Ib9df71192937164ff95ce564195d5d68508ec69d
2020-03-16 09:40:01 +08:00
markchien
070c260a65 Change TetheringConstants class to final
Bug: 151322331
Test: m doc-comment-check-docs
Change-Id: Ia02be3d1d91a08ae4a56b25560ed448c96a693db
2020-03-15 22:54:57 +08:00
Automerger Merge Worker
c54682b084 Merge "Added OWNERS file for inputmethod" am: 80e92b670d
Change-Id: I1acc6a3cddedf007dd9fc45826ff9741338137c8
2020-03-14 04:33:55 +00:00
Treehugger Robot
80e92b670d Merge "Added OWNERS file for inputmethod" 2020-03-14 04:22:17 +00:00
Automerger Merge Worker
00df02f112 Merge "Resolve ambiguous argument." am: 486a8664ea
Change-Id: I4c03bb6d16127929f4d60aa071aee18e8ac4c669
2020-03-14 03:52:51 +00:00
Chalard Jean
486a8664ea Merge "Resolve ambiguous argument." 2020-03-14 03:38:01 +00:00
Automerger Merge Worker
6b98b93aac Merge "Pad ime_switcher same as navbar buttons" am: c5d8c9b1aa
Change-Id: I5b49fc1dedeb3306b690a7ae6a2260aecd3c6407
2020-03-14 01:34:35 +00:00
Lucas Dupin
c5d8c9b1aa Merge "Pad ime_switcher same as navbar buttons" 2020-03-14 01:17:12 +00:00
Automerger Merge Worker
2d281436d7 Merge "EffectsTest: Add multi-threaded client for Visualizer" am: 6fed7a9d16
Change-Id: I94b1216ca96ee2a437b1d8f77b02fd7f07bfebc5
2020-03-14 00:55:50 +00:00
Treehugger Robot
6fed7a9d16 Merge "EffectsTest: Add multi-threaded client for Visualizer" 2020-03-14 00:35:53 +00:00
Automerger Merge Worker
6c5e9c680c Merge "Smoother signal bar transition during CBRS data switching" am: c67dbaa94c
Change-Id: If6b4d47e3c03b1957aa4c3b5e403ababefcfc946
2020-03-14 00:07:06 +00:00
Xiangyu/Malcolm Chen
c67dbaa94c Merge "Smoother signal bar transition during CBRS data switching" 2020-03-13 23:51:57 +00:00
Malcolm Chen
10409ddcde Smoother signal bar transition during CBRS data switching
Upon CBRS switch or any data switch between a group, assume the target
sub validated up to 2 seconds if the previous data sub was validated.

Bug: 131776846
Test: manual - switch data between primary and CBRS and observe signal
bar transitions.

Change-Id: I45d2558510bcd1b86b001f723bbd3dd8dc3a3914
Merged-In: I45d2558510bcd1b86b001f723bbd3dd8dc3a3914
2020-03-13 23:51:45 +00:00
Mikhail Naganov
60d2cb7e30 EffectsTest: Add multi-threaded client for Visualizer
Adding a multi-thread client helps to unveil problems
with concurrent use of VisualizerEffect.

Bug: 149375271
Test: enable "Multithreaded Use" in Visualizer Test
Change-Id: Id485790dc7e91fde5dc5844a287645e96f8ec253
2020-03-13 23:02:58 +00:00
Automerger Merge Worker
1285a78ec0 Merge "Rollback SystemApis for Mainline" am: 127fd8d6e8
Change-Id: I3f6beffb6459e095e766f483d13ff7831e60d75a
2020-03-13 21:50:31 +00:00
Daniel Bright
127fd8d6e8 Merge "Rollback SystemApis for Mainline" 2020-03-13 21:36:43 +00:00
Automerger Merge Worker
139fb3e1c8 Merge "Rollback @SystemApi on ApnSetting" am: f36f5590ac
Change-Id: I61ae73c8afa40f29b8adb5838fe620dc17198ef0
2020-03-13 21:15:50 +00:00
Treehugger Robot
f36f5590ac Merge "Rollback @SystemApi on ApnSetting" 2020-03-13 20:58:11 +00:00
Automerger Merge Worker
ff485dd4bf Merge "Make createLocationInfoSanitizedCopy as @hide." am: ea4d3a958e
Change-Id: I84aa8d02d06427cc2d2db3b8c1ccf44ae9cde8ad
2020-03-13 20:49:02 +00:00
Automerger Merge Worker
0520203a5e Merge "Re-order parameters of setUiccApplicationsEnabled." am: deb27cc388
Change-Id: I6bda4c644a1f238992a0e31442d78eb9c449d9b3
2020-03-13 20:48:29 +00:00
Automerger Merge Worker
0a5acf610a Merge "Visualizer: Fix race condition in setCaptureCallBack" am: 7d38086754
Change-Id: Id7184ef91ed88a9f10fcb1f5978c60c2cc84d637
2020-03-13 20:48:06 +00:00
Xiangyu/Malcolm Chen
ea4d3a958e Merge "Make createLocationInfoSanitizedCopy as @hide." 2020-03-13 20:38:45 +00:00
Malcolm Chen
de9182c01f Make createLocationInfoSanitizedCopy as @hide.
As we are not shipping Telephony mainline and it's TBD whether
TelephonyRegistry will be part of mainline or not, we change
createLocationInfoSanitizedCopy from @SystemApi back to @hide.

Bug: 148179832
Test: build
Change-Id: I65dea196ab80aec96b6b35edcc0059cefc2f1b43
Merged-In: I65dea196ab80aec96b6b35edcc0059cefc2f1b43
2020-03-13 20:38:16 +00:00