Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
384,754 Commits 3 Branches 0 Tags
55a06bb5d1b0af1f2fee0b4eafd8cd7732352885
Commit Graph

384754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
55a06bb5d1 Merge "Shell: Grant CACHE_CONTENT to Shell" 
am: dd2e005d2f

Change-Id: I5a409357fa9a4acd2cc7cbdf707b7388557e8643
 2019-04-10 01:20:37 -07:00
Narayan Kamath
dd2e005d2f Merge "Shell: Grant CACHE_CONTENT to Shell" 2019-04-10 07:57:27 +00:00
Remi NGUYEN VAN
76de94e78c Merge "Fix comment on StaticIpConfiguration#getDomains" 
am: a1e48f3c9a

Change-Id: Ia664b08eabe344470a5c08e5510f1a8f7132ac73
 2019-04-09 23:54:09 -07:00
Chenbo Feng
6a9b888b52 Merge "Add smoke test for jni library" 
am: b0b166054d

Change-Id: Iedb44739539f63090b067c1a25d4e83c333caddb
 2019-04-09 23:50:10 -07:00
Treehugger Robot
a1e48f3c9a Merge "Fix comment on StaticIpConfiguration#getDomains" 2019-04-10 06:30:55 +00:00
Treehugger Robot
b0b166054d Merge "Add smoke test for jni library" 2019-04-10 06:30:26 +00:00
Chiachang Wang
3b4698c39c Merge "Move data stall definitions out from Setting" 
am: e9a39ceb6b

Change-Id: Iff3db380ed6210811965ec8919acb6c06fbbf1da
 2019-04-09 21:14:56 -07:00
Chiachang Wang
e9a39ceb6b Merge "Move data stall definitions out from Setting" 2019-04-10 03:27:19 +00:00
Chiachang Wang
2449e583d8 Move data stall definitions out from Setting 
From mainline perspective, we should use android flag api
instead of using Settings. Thus, move the definitions into
NetworkStack.

Bug:120013793
Test: atest NetworkStackTests SettingsBackupTest
Change-Id: I8e1fb5b47fff3bf624131ba1f5732daabd991e6d
Merged-In: I8e1fb5b47fff3bf624131ba1f5732daabd991e6d
Merged-In: I0a2a1e5d3de14ea86556ca471e26064df3481412
 2019-04-10 02:37:57 +00:00
Chiachang Wang
2a94e4025f Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces" 
am: c72f456b19

Change-Id: Id5922a41d07c95958090f88a65d22ef5883aefff
 2019-04-09 19:37:20 -07:00
Remi NGUYEN VAN
5bccd69318 Merge "Crash the system server if network stack is lost" 
am: 825181be4c

Change-Id: Ieddb968a162c20af90dd290c2b26b48659a480a9
 2019-04-09 19:30:57 -07:00
Chiachang Wang
c72f456b19 Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces" 2019-04-10 02:27:30 +00:00
Remi NGUYEN VAN
825181be4c Merge "Crash the system server if network stack is lost" 2019-04-10 01:41:20 +00:00
Kiyoung Kim
b3d1599e29 Merge "Check if product app is unbundled from property." 
am: 2ed229287d

Change-Id: I26d106c372f584939e012dd6c2a1eaa5dfcef8c3
 2019-04-09 17:51:24 -07:00
Kiyoung Kim
2ed229287d Merge "Check if product app is unbundled from property." 2019-04-10 00:34:54 +00:00
Amit Mahajan
cd1ce182d7 Merge "Make sure APN type ALL does not include types that are not wild cardable" 
am: 0d4f48f49d

Change-Id: Icc3d660c4639490adaf275a7bbc744ac1c8dfff1
 2019-04-09 17:31:59 -07:00
Amit Mahajan
0d4f48f49d Merge "Make sure APN type ALL does not include types that are not wild cardable" 2019-04-10 00:08:43 +00:00
Amit Mahajan
999f2f5e38 Make sure APN type ALL does not include types that are not wild cardable 
Test: manual, atest FrameworksTelephonyTests:ApnSettingTest
Bug: 130167974
Merged-in: Ia029df91781ee125078a2b4cc4d0364919c95fd6
Change-Id: Ia029df91781ee125078a2b4cc4d0364919c95fd6
(cherry picked from commit 72ea0fd5a7)
 2019-04-09 14:57:41 -07:00
Chenbo Feng
5f8a630da7 Add smoke test for jni library 
Since the Framework net test require jni library
libnetworkstatsfactorytestjni, but the test fails to load that library
unless *all* the dependencies of that library are explicitly listed in
jni_libs, whenever any of the dependencies changes the framework net
test will start failing and it might not be catched since the change
might not related to frameworks/base. And this smoke test is aimed to
spot those native library changes and it should be stable enough to put
in global presubmit.

Bug: 124764595
Test: FrameworksNetSmokeTests
Change-Id: Id24e7f0558b5643e4ad7393e85f1f0a2bd875615
 2019-04-09 14:45:35 -07:00
Neil Fuller
50a1a19f46 Merge "Switch to HexEncoding from ByteStringUtils" 
am: 46a93ae8f8

Change-Id: Iabd1b701d3c3f44b50642d25eb3f2960eaebc48d
 2019-04-09 11:03:25 -07:00
Narayan Kamath
f207dc666f Shell: Grant CACHE_CONTENT to Shell 
Required to test ContentResover#[get|put]Cache

Bug: 127711435
Test: atest CtsContentTestCases

(cherry picked from commit a31ed1bbdd)

Merged-In: I5eb72772a0a35897611dd6db95c68a2d2e971e9a
Change-Id: I91a91a2969db175d88e9f41938869bc751f7b108
 2019-04-09 18:58:02 +01:00
Shuo Qian
ed0690d2bb Merge "Use Received Uri as Gateway Uri" 
am: 211771cf79

Change-Id: Ibf96f72717f99d9aab112161c4ce354e1cf9e6c2
 2019-04-09 10:54:30 -07:00
Neil Fuller
46a93ae8f8 Merge "Switch to HexEncoding from ByteStringUtils" 2019-04-09 17:45:29 +00:00
Benedict Wong
46a29e05eb Merge "Fix remove-before-add for IpSecService RefcountedResource" 
am: 3102fa42a7

Change-Id: Ief286a54a93efd731deeff9fc32815663ab7695d
 2019-04-09 10:39:16 -07:00
Shuo Qian
211771cf79 Merge "Use Received Uri as Gateway Uri" 2019-04-09 17:29:19 +00:00
Benedict Wong
3102fa42a7 Merge "Fix remove-before-add for IpSecService RefcountedResource" 2019-04-09 17:22:56 +00:00
Leland Miller
00f8521608 Merge "Create new RcsThreadQueryResultParcelable" 
am: ad2928ac86

Change-Id: Ife195a2760bf81bf5da0cc9d72fde1b6038778d4
 2019-04-09 09:49:18 -07:00
Treehugger Robot
ad2928ac86 Merge "Create new RcsThreadQueryResultParcelable" 2019-04-09 16:29:13 +00:00
vichang
f3808b772c Merge "Remove the feature flag for time zone picker" 
am: 3183cbf6dc

Change-Id: I60e028709d06d26377a3d8d1db53822987620e7e
 2019-04-09 05:47:34 -07:00
Junyu Lai
5465460914 Merge "Fix onBlockedStatusChanged does not work on multiple networks" 
am: 289b565dba

Change-Id: Ia8edf1e9d0f49da5be2bac1889cd0001010a869b
 2019-04-09 05:43:18 -07:00
Chalard Jean
4a687891b2 Merge "Move the latest AIDL update to the bottom" 
am: fb08776087

Change-Id: Ic976eb8fa91644fc5a3bcadf2165bdf46af89088
 2019-04-09 05:39:12 -07:00
vichang
3183cbf6dc Merge "Remove the feature flag for time zone picker" 2019-04-09 12:23:19 +00:00
Junyu Lai
289b565dba Merge "Fix onBlockedStatusChanged does not work on multiple networks" 2019-04-09 12:13:26 +00:00
Chalard Jean
fb08776087 Merge "Move the latest AIDL update to the bottom" 2019-04-09 12:06:03 +00:00
Chiachang Wang
e05d9d88bd Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces 
ConnectivityManager and its usages are removed from
NetworkStatsService. After that, forceUpdateIfaces requires
information that only ConnectivityService has, hence
restricting the calling permission to NETWORK_STACK or
MAINLINE_NETWORK_STACK permission. The required permission
will be changed from READ_NETWORK_USAGE_HISTORY to
NETWORK_STACK or MAINLINE_NETWORK_STACK. This change would make
it impossible to call outside the system.

Bug: 126830974
Test: atest FrameworksNetTests
Change-Id: I776484921b2dbb6735d7940c558fb5e4baed6d1e
 2019-04-09 19:42:52 +08:00
Neil Fuller
0cb55a64c4 Merge "Switch to HexEncoding from ByteStringUtils" 
am: 70f7a0bf04

Change-Id: I36db54949275402b7f25d8e2a1ea2ed6558a44d2
 2019-04-09 03:11:50 -07:00
Neil Fuller
70f7a0bf04 Merge "Switch to HexEncoding from ByteStringUtils" 2019-04-09 09:50:59 +00:00
Remi NGUYEN VAN
06f39168df Crash the system server if network stack is lost 
Crash the system server if it cannot bind to the network stack, or if
the network stack crashes. This is better than keeping the system
running in a bad state where all networking would be broken.
Before the network stack was moved to a different process, the whole
system would go down when it encountered a crash.

Test: added crash in NetworkStack, verified system_server restart
Bug: 130028724
Change-Id: Ia8ee7699c4b15ba4b1116c7ba9171bf6034b52c3
 2019-04-09 18:17:45 +09:00
Neil Fuller
62af80f9c8 Switch to HexEncoding from ByteStringUtils 
Migration in preparation for deletion of ByteStringUtils.

Bug: 124232146
Test: build only
Merged-In: I07983ca596443a3e00616b63355c6504376f3e7c
Change-Id: I07983ca596443a3e00616b63355c6504376f3e7c
 2019-04-09 09:09:35 +01:00
Orion Hodson
26f99236f3 Merge "ActivityManager: process stop needs a process to stop" 
am: e467620566

Change-Id: I9316853c0625b8a9f352f321208f0414184e2d43
 2019-04-09 00:03:22 -07:00
Treehugger Robot
e467620566 Merge "ActivityManager: process stop needs a process to stop" 2019-04-09 06:50:43 +00:00
Chalard Jean
7e5e4734a8 Merge "Address leftover comments on aosp/894233" 
am: 8781aa3fbe

Change-Id: I87f120778b2dc6743edc7fdd4e5390b68de05590
 2019-04-08 23:38:53 -07:00
Tej Singh
a99fe6e2bf Merge "Mainline logging to statsd: native static libs" 
am: fe3ebab0b3

Change-Id: I7c241f209b133ec5465a47e384528c16c4026744
 2019-04-08 23:34:40 -07:00
Remi NGUYEN VAN
2877796f70 Merge "Expose captive portal urls for configuration" 
am: 7bb487a582

Change-Id: If5970fdafa7c624855ef9d29921542e2fb6fdfa0
 2019-04-08 23:29:46 -07:00
Xin Li
2beb5fa664 [automerger skipped] Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master" 
am: a4431ffb7a -s ours
am skip reason: subject contains skip directive

Change-Id: I8245f3d001b3c331c2dc586b4d835db2219e1986
 2019-04-08 23:21:50 -07:00
Chalard Jean
8781aa3fbe Merge "Address leftover comments on aosp/894233" 2019-04-09 05:51:18 +00:00
Treehugger Robot
fe3ebab0b3 Merge "Mainline logging to statsd: native static libs" 2019-04-09 05:42:12 +00:00
Xin Li
fe0b0e38c3 [automerger skipped] DO NOT MERGE -- Merge PPRL.190405.003 into master 
am: 1eaefb3010 -s ours
am skip reason: subject contains skip directive

Change-Id: I140518e96feabfc9f22622f88ba321bec18212e1
 2019-04-08 22:15:43 -07:00
Remi NGUYEN VAN
7bb487a582 Merge "Expose captive portal urls for configuration" 2019-04-09 04:37:48 +00:00
Xin Li
a4431ffb7a Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master" 2019-04-09 04:29:22 +00:00