OSDN Git Service
Abhijeet Kaur [Tue, 16 Apr 2019 12:10:31 +0000 (05:10 -0700)]
Merge "Notify the caller about I/O error"
am:
2f206c6270
Change-Id: I59b43aa3c092ee577833da5dc110953d4b21154d
Treehugger Robot [Tue, 16 Apr 2019 11:52:31 +0000 (11:52 +0000)]
Merge "Notify the caller about I/O error"
Abhijeet Kaur [Mon, 15 Apr 2019 09:16:42 +0000 (10:16 +0100)]
Notify the caller about I/O error
Call onError for caller of BugreportManager.start() if any io error
occurs during runtime.
Test: Tested manually by throwing IO exception in the code when
bugreport is being generated, onError of the callback successfully
called.
Change-Id: I9033d85d392b926041fc26a86806a370752d062d
Luke Huang [Tue, 16 Apr 2019 09:17:09 +0000 (02:17 -0700)]
Merge "Fix DnsResolver API could not bypass private DNS correctly"
am:
40e7fb6a9b
Change-Id: Iaa36a882c2bcfd3bb11153d2b37cdab887ad9004
Luke Huang [Tue, 16 Apr 2019 09:03:22 +0000 (09:03 +0000)]
Merge "Fix DnsResolver API could not bypass private DNS correctly"
Chalard Jean [Tue, 16 Apr 2019 05:29:28 +0000 (22:29 -0700)]
Merge "Restrict access to dangerous methods to <= P"
am:
ae8548df0b
Change-Id: I3c1271e00e026518e9c4ddafc931a2cac87dcee0
Chalard Jean [Tue, 16 Apr 2019 05:17:20 +0000 (05:17 +0000)]
Merge "Restrict access to dangerous methods to <= P"
Junyu Lai [Tue, 16 Apr 2019 05:04:18 +0000 (22:04 -0700)]
Merge "Release keepalive slot after stopped"
am:
a1fedb8f5c
Change-Id: Ic707f22fb12c98c187e89cc8ad39773f61737506
Junyu Lai [Tue, 16 Apr 2019 04:46:18 +0000 (04:46 +0000)]
Merge "Release keepalive slot after stopped"
Luke Huang [Tue, 16 Apr 2019 03:50:15 +0000 (11:50 +0800)]
Fix DnsResolver API could not bypass private DNS correctly
Bug:
130594022
Test: atest DnsResolverTest
Change-Id: Ibf3edac3075d921d189237c485871efb869b320b
Xiangyu/Malcolm Chen [Tue, 16 Apr 2019 00:13:31 +0000 (17:13 -0700)]
Merge "Add comments in grouping APIs to clarify possible exceptions."
am:
42adca41b9
Change-Id: I6dd991c9e77cdaa8a295e31d382086327d168b21
Xiangyu/Malcolm Chen [Mon, 15 Apr 2019 23:47:41 +0000 (23:47 +0000)]
Merge "Add comments in grouping APIs to clarify possible exceptions."
Hall Liu [Mon, 15 Apr 2019 23:39:25 +0000 (16:39 -0700)]
Merge "Add EHPLMN and HPLMN to SubscriptionInfo"
am:
4d6ce5406a
Change-Id: I0713d5321bb7baf2a7e35cef9fbec0ae85790711
Hall Liu [Mon, 15 Apr 2019 23:27:40 +0000 (23:27 +0000)]
Merge "Add EHPLMN and HPLMN to SubscriptionInfo"
Shuo Qian [Mon, 15 Apr 2019 23:21:38 +0000 (16:21 -0700)]
Merge "Fix Emergency Number API doc"
am:
3d50a3df6d
Change-Id: I33cd5921ed6cb19078818fb52b204d59d1cc51c7
Riddle Hsu [Mon, 15 Apr 2019 23:14:50 +0000 (16:14 -0700)]
Merge "Get new surface if it was released from setWindowStopped"
am:
90424e8060
Change-Id: I0c90fa48d70bd3f3f5faeecd756fb7c28cbda85d
Shuo Qian [Mon, 15 Apr 2019 23:12:42 +0000 (23:12 +0000)]
Merge "Fix Emergency Number API doc"
Treehugger Robot [Mon, 15 Apr 2019 22:52:55 +0000 (22:52 +0000)]
Merge "Get new surface if it was released from setWindowStopped"
Malcolm Chen [Thu, 4 Apr 2019 01:39:21 +0000 (18:39 -0700)]
Add comments in grouping APIs to clarify possible exceptions.
Bug:
127408608
Test: cts, unittest, TelephonyManagerTestApp
Change-Id: I3671e366be7e8c3a75b5ee23b7cf88a33ecd3a4f
Merged-In: I3671e366be7e8c3a75b5ee23b7cf88a33ecd3a4f
sqian [Fri, 12 Apr 2019 23:35:13 +0000 (16:35 -0700)]
Fix Emergency Number API doc
1) remove documentation about null return
2) Map including the key*s* as the active subscription ID*s*
Bug:
130426238
Test: Treehugger
Change-Id: I4c9b682ef25378b9de91cd6255ed6fc514ea220d
Merged-In: I4c9b682ef25378b9de91cd6255ed6fc514ea220d
(cherry picked from commit
aca6eb7dac0a307756d0c3e76b26503618f40df5)
Hall Liu [Thu, 11 Apr 2019 22:28:20 +0000 (15:28 -0700)]
Add EHPLMN and HPLMN to SubscriptionInfo
Add EHPLMN and HPLMN fields to SubscriptionInfo. These fields are read
from the ICC card.
Bug:
130253962
Test: manual
Change-Id: If98c57c14e39b917a5e7e8bbc59c2170989b63a7
Ugo Yu [Mon, 15 Apr 2019 21:01:00 +0000 (14:01 -0700)]
Merge "Refine Bluetooth Metadata API"
am:
e5cf74326d
Change-Id: I8b7e9137f67dfa27dd1556f49bdd4cc702015150
Treehugger Robot [Mon, 15 Apr 2019 20:37:28 +0000 (20:37 +0000)]
Merge "Refine Bluetooth Metadata API"
calvinpan [Mon, 15 Apr 2019 20:10:13 +0000 (13:10 -0700)]
Merge "Add NonNull in Carriers constant"
am:
40c918b924
Change-Id: Ia7cc8c0bdd2c513d969ea29c2de55797f9c7e035
Treehugger Robot [Mon, 15 Apr 2019 19:53:50 +0000 (19:53 +0000)]
Merge "Add NonNull in Carriers constant"
calvinpan [Fri, 12 Apr 2019 01:14:02 +0000 (09:14 +0800)]
Add NonNull in Carriers constant
Add NonNull in Carriers constant
Bug:
126699334
Test: build pass
Change-Id: Ifda6407092847e8863cba79360eba3df12f9c7e1
Merged-In: I428ff623d46d3891b05882df5774343bfe3234c0
Neil Fuller [Mon, 15 Apr 2019 17:47:04 +0000 (10:47 -0700)]
Merge "Switch ByteStringUtils over to HexEncoding impl"
am:
6150065560
Change-Id: If57eb62d54b6c473051a560bf523819f0b971439
Neil Fuller [Mon, 15 Apr 2019 17:30:35 +0000 (17:30 +0000)]
Merge "Switch ByteStringUtils over to HexEncoding impl"
Mathew Inwood [Mon, 15 Apr 2019 12:33:27 +0000 (05:33 -0700)]
Merge "Move some telephony methods to max-sdk-p list."
am:
6c702ac545
Change-Id: I6205948f0ba7d0c0bed76ea583f8bbaeb47452f6
Mathew Inwood [Mon, 15 Apr 2019 12:16:09 +0000 (12:16 +0000)]
Merge "Move some telephony methods to max-sdk-p list."
Makoto Onuki [Mon, 15 Apr 2019 11:07:46 +0000 (04:07 -0700)]
Merge "Update OWNERS"
am:
abc9b9edcc
Change-Id: I77c5fe25ef1a790c379ff160171946f79fdb316d
Treehugger Robot [Mon, 15 Apr 2019 10:46:32 +0000 (10:46 +0000)]
Merge "Update OWNERS"
junyulai [Tue, 9 Apr 2019 06:37:35 +0000 (14:37 +0800)]
Release keepalive slot after stopped
Currntly, keepalive slot is released when stop() is called. Next
starting keepalive can use the same slot number while previous
keepalive is still stopping. When the previous keepalive is
stopped, the incoming as will be processed by the new keepalive.
This change release keepalive slot after the result of stopping
has returned. Thus, newly created keepalive cannot allocate the
same slot number while lower layer is still processing stop event.
This change also disable flaky assertions that are caused by
test port has been occupied by other process.
Bug:
129512753
Test: 1. atest com.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 100
2. atest FrameworksNetTests --generate-new-metrics 10
3. simulate the fail case manually.
Change-Id: I1991627545519ee5cb408a3df3a006f710f4af7b
Bill Yi [Sat, 13 Apr 2019 14:43:34 +0000 (07:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
8ab8829243 -s ours
am skip reason: subject contains skip directive
Change-Id: I026bc44a62904e34e386acd59055a9a191a2beff
Treehugger Robot [Sat, 13 Apr 2019 14:36:12 +0000 (14:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 13 Apr 2019 12:50:21 +0000 (05:50 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
88516600bb -s ours
am skip reason: subject contains skip directive
Change-Id: Ia4e5b9fbaefc3cdeed585cf6a22470b49808e703
Bill Yi [Sat, 13 Apr 2019 12:35:30 +0000 (05:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
0d903420f3 -s ours
am skip reason: subject contains skip directive
Change-Id: I72aa63df70ded1ffd9bfb7c4a0722e3bd748bedb
Treehugger Robot [Sat, 13 Apr 2019 12:35:12 +0000 (12:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 13 Apr 2019 12:34:11 +0000 (05:34 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
cad47dff63 -s ours
am skip reason: subject contains skip directive
Change-Id: I0ea934f64f49c84683c47d646332842bd34ccb9f
Bill Yi [Sat, 13 Apr 2019 12:33:01 +0000 (05:33 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
7c8372f59a -s ours
am skip reason: subject contains skip directive
Change-Id: If01975bf550d632d6ee07509d344655455526027
Bill Yi [Sat, 13 Apr 2019 12:31:20 +0000 (05:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
a5ab7f0cef -s ours
am skip reason: subject contains skip directive
Change-Id: If02ab0433db71a9419179767268417acb63dd579
Bill Yi [Sat, 13 Apr 2019 12:25:40 +0000 (05:25 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
db9d21a42c -s ours
am skip reason: subject contains skip directive
Change-Id: Icf338880582ec6f3855c3fc06f2f09fec5fd6bd7
Bill Yi [Sat, 13 Apr 2019 12:24:27 +0000 (05:24 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
ba1678939f -s ours
am skip reason: subject contains skip directive
Change-Id: I2791e40e60ec455cff9d35670fcec6f6c62f2b08
Bill Yi [Sat, 13 Apr 2019 12:23:18 +0000 (05:23 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
5d56ad0983 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia53b6b5e75e0633637f743b5170a6d5dc40b250b
Bill Yi [Sat, 13 Apr 2019 12:22:12 +0000 (05:22 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
640944a399 -s ours
am skip reason: subject contains skip directive
Change-Id: I4bf0c92b413c9278ae73fe29617d22786a2a55fc
Bill Yi [Sat, 13 Apr 2019 12:20:31 +0000 (05:20 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
6904ea874e -s ours
am skip reason: subject contains skip directive
Change-Id: If0069b72f4bcff30afc3eb5e8a8d1fd55ac4d565
Bill Yi [Sat, 13 Apr 2019 12:16:15 +0000 (05:16 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am:
91455a6204 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib06e954f872113500021f14dcf9a8b23093934ad
Treehugger Robot [Sat, 13 Apr 2019 12:14:21 +0000 (12:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Sat, 13 Apr 2019 12:13:21 +0000 (12:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Sat, 13 Apr 2019 12:10:24 +0000 (12:10 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Sat, 13 Apr 2019 12:10:21 +0000 (12:10 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Sat, 13 Apr 2019 12:02:25 +0000 (12:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Sat, 13 Apr 2019 12:02:21 +0000 (12:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Sat, 13 Apr 2019 11:59:26 +0000 (11:59 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Sat, 13 Apr 2019 11:58:45 +0000 (11:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Sat, 13 Apr 2019 11:58:42 +0000 (11:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Sat, 13 Apr 2019 11:47:32 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 13 Apr 2019 09:08:02 +0000 (02:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3488f6c74138241f29504eafd73569f780ee9a74
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 06:23:15 +0000 (23:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4bb37b12e29ecd0a1a8a726d4a761eaba4abd1f
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 06:15:48 +0000 (23:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I492f38a82826682746367dfb5122e22b934712f2
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 04:17:01 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I219d0c8ab1cf805a0f32e64b53dee3a94abfa68a
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 04:09:30 +0000 (21:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55e7b90aabc7dbc880c72cffe1e5282c8ef27f1d
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 04:02:07 +0000 (21:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f5ac7cc91022343245dad427a0dd40c4ed12594
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 02:47:39 +0000 (19:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia4b5b3d094538e5a3e64613a9b7dc11591aaf809
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 02:40:50 +0000 (19:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f47607801a75f9c98ec454e7902102dc3e39988
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 02:11:58 +0000 (19:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6d280118ec178a0e787498bd9e38c816e156e6bb
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 01:58:20 +0000 (18:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b163a3870ef427527470e0443bab579cb88ea36
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 01:50:31 +0000 (18:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59be6fef50c3065874ca36a6ed77bfa93242c3ee
Auto-generated-cl: translation import
Bill Yi [Sat, 13 Apr 2019 01:42:35 +0000 (18:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I271a1675c49cfaabbf3cb74c2d805390efc2161f
Auto-generated-cl: translation import
Jack Yu [Fri, 12 Apr 2019 23:43:53 +0000 (16:43 -0700)]
Merge "Fixed the incorrect function signature"
am:
0233bc3e85
Change-Id: Ic78ee64402bce334f30073c9bf52589314404066
Jack Yu [Fri, 12 Apr 2019 23:13:38 +0000 (23:13 +0000)]
Merge "Fixed the incorrect function signature"
Nathan Harold [Fri, 12 Apr 2019 23:12:05 +0000 (16:12 -0700)]
Merge "Remove key_ prefix from CarrierConfig Strings"
am:
b45630502b
Change-Id: I34ed2b7c5259aabbd3ab3fce5723cfeb512d6a4a
Chenbo Feng [Fri, 12 Apr 2019 23:06:30 +0000 (16:06 -0700)]
Merge "Ask netd to swap stats map before reading"
am:
e13a14d5cf
Change-Id: I7a683e479fe7631a167138314bcf5948e72386ec
Andreas Gampe [Fri, 12 Apr 2019 23:02:18 +0000 (16:02 -0700)]
Merge "Framework: Lock inversion checker"
am:
33ee4a5536
Change-Id: Ib765e460a1d4763f33457e42a7f4a8ac4f5fc6c2
Nathan Harold [Fri, 12 Apr 2019 22:50:04 +0000 (22:50 +0000)]
Merge "Remove key_ prefix from CarrierConfig Strings"
Treehugger Robot [Fri, 12 Apr 2019 22:35:52 +0000 (22:35 +0000)]
Merge "Ask netd to swap stats map before reading"
Andreas Gampe [Fri, 12 Apr 2019 22:17:15 +0000 (22:17 +0000)]
Merge "Framework: Lock inversion checker"
Youming Ye [Fri, 12 Apr 2019 22:06:44 +0000 (15:06 -0700)]
Merge "Add MEDIA_TIMEOUT error for RTCP timeout"
am:
6f2341ad62
Change-Id: Ie7b32d9fbe7f453e6ee8b97352aeaae56af1181e
Treehugger Robot [Fri, 12 Apr 2019 21:54:13 +0000 (21:54 +0000)]
Merge "Add MEDIA_TIMEOUT error for RTCP timeout"
Jakub Pawlowski [Fri, 12 Apr 2019 18:28:51 +0000 (11:28 -0700)]
Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull"
am:
da2b966f6e
Change-Id: I29063ecdafccecf10d73ea091d1eafd3d4e934ad
Treehugger Robot [Fri, 12 Apr 2019 18:12:27 +0000 (18:12 +0000)]
Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull"
Andreas Gampe [Fri, 12 Apr 2019 17:54:00 +0000 (10:54 -0700)]
Merge "Preload: Add a simple test for the state of classes"
am:
fe1c4420c5
Change-Id: I8df9c6ead09679d879bac0edda5fd0820f0adf47
Andreas Gampe [Mon, 4 Mar 2019 22:15:18 +0000 (14:15 -0800)]
Framework: Lock inversion checker
Add an agent-based lock inversion checker. The agent will dynamically
rewrite bytecode to inject calls to LockHook, which runs a checker
on these.
Implement a simple on-thread checker that keeps a per-thread stack
of locks and a global map of lock ordering. As-is, transitivity of
checks is not guaranteed, but should be captured in most practical
cases.
To run a process with the lock checker, start the process with the
agent. The helper script start_with_lockagent.sh can be used for this:
adb shell setprop wrap.pkg-name script start_with_lockagent
(cherry picked from commit
aeb6fce5b33680bc538dbd66979a28bcba1329b4)
Bug:
124744938
Test: manual
Merged-In: Idd9a7066a5b8cb8c0de2e995f08759c98d9473e1
Change-Id: Idd9a7066a5b8cb8c0de2e995f08759c98d9473e1
Andreas Gampe [Fri, 12 Apr 2019 17:36:35 +0000 (17:36 +0000)]
Merge "Preload: Add a simple test for the state of classes"
David Brazdil [Fri, 12 Apr 2019 16:12:03 +0000 (09:12 -0700)]
Merge "Pass core platform API policy property to ART"
am:
e4f9b348a5
Change-Id: Ic6de2cd07ef23e62fbd8e3530c7385dd161404e9
David Brazdil [Fri, 12 Apr 2019 15:43:15 +0000 (15:43 +0000)]
Merge "Pass core platform API policy property to ART"
Lorenzo Colitti [Fri, 12 Apr 2019 13:29:44 +0000 (06:29 -0700)]
Merge changes I4f181789,Ia8a0c99b
am:
6efdc4a6cd
Change-Id: I50207fe29953be7759bbd01cb93268202067f764
Lorenzo Colitti [Fri, 12 Apr 2019 13:11:18 +0000 (13:11 +0000)]
Merge changes I4f181789,Ia8a0c99b
* changes:
Revert new tests and PackageManager mock
Revert "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""
Lorenzo Colitti [Fri, 12 Apr 2019 10:50:22 +0000 (19:50 +0900)]
Revert new tests and PackageManager mock
A mocked PackageManager caused test failures in existing tests.
Revert that for now to make tests pass again.
Bug:
114231106
Bug:
130397860
Test: atest FrameworksNetTests
Change-Id: I4f181789152438f18e6cd2d235d76fabe3872ea3
Lorenzo Colitti [Fri, 12 Apr 2019 10:48:06 +0000 (10:48 +0000)]
Revert "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""
This reverts commit
3897df2e36d4d015304b398c545c1232ee35a1c9.
Reason for revert: Rolling forward, will fix tests in same CL stack.
Bug:
114231106
Bug:
130397860
Test: FrameworksNetTests
Change-Id: Ia8a0c99b4e1fd5dff26c881715cd876618ca4321
Remi NGUYEN VAN [Fri, 12 Apr 2019 10:41:01 +0000 (03:41 -0700)]
Merge "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""
am:
6617bf81c9
Change-Id: I601649e15c97a8fd1732c4d38dab9d5556c5f175
Remi NGUYEN VAN [Fri, 12 Apr 2019 10:25:46 +0000 (10:25 +0000)]
Merge "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""
David Brazdil [Fri, 12 Apr 2019 10:18:07 +0000 (11:18 +0100)]
Pass core platform API policy property to ART
When starting ART, read property
""persist.debug.dalvik.vm.core_platform_api_policy" and pass its value
on the command line. This enables users to enable core platform API
violation reporting on demand. Note that the settings take effect after
a reboot.
Bug:
125701194
Test: compiles, boots, reporting observed
Change-Id: I97507afc85d8e186736700979c5dbf2ad0f79f12
Przemyslaw Szczepaniak [Fri, 12 Apr 2019 09:13:24 +0000 (02:13 -0700)]
Merge changes from topic "nnapi_ext_restrict"
am:
aef149ecde
Change-Id: I62a851d5feccb0c8c201c76dc1771d98068da45f
Przemyslaw Szczepaniak [Fri, 12 Apr 2019 09:06:23 +0000 (02:06 -0700)]
Add getLocationFlags getter to PackageManagerNative.
am:
02d8a7c57d
Change-Id: If834090e6a66b146ea38dc9116c8eb3a7a5050af
Remi NGUYEN VAN [Fri, 12 Apr 2019 09:05:40 +0000 (09:05 +0000)]
Revert "Block incoming non-VPN packets to apps under fully-routed VPN"
This reverts commit
fd8f96d71925cc80f5052365af2e5150cc0ec3ca.
This change does not have any topic: not reverting the other 2 commits in the original topic.
Reason for revert: broke FrameworksNetTests presubmit: b/
130397860
Change-Id: Iff41d9fe97fafea44680c8d67d1ce19277548cc0
Przemyslaw Szczepaniak [Fri, 12 Apr 2019 08:50:56 +0000 (08:50 +0000)]
Merge changes from topic "nnapi_ext_restrict"
* changes:
Remove PRODUCT_SERVICES from PackageManagerNative.getLocation.
Add getLocationFlags getter to PackageManagerNative.
Abhijeet Kaur [Fri, 12 Apr 2019 08:41:49 +0000 (01:41 -0700)]
Merge "Pass valid file descriptor to binder"
am:
0013d45b27
Change-Id: I034b8a273e123523bb038bf9d8a88ad4c652b328
Treehugger Robot [Fri, 12 Apr 2019 08:23:33 +0000 (08:23 +0000)]
Merge "Pass valid file descriptor to binder"
Jakub Pawlowski [Wed, 10 Apr 2019 16:48:57 +0000 (18:48 +0200)]
Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull
Test: compilation
Bug:
115639878
Merged-In: I5f895d65a7036275ab0faa0afd2ee1eebc416476
Change-Id: I5f895d65a7036275ab0faa0afd2ee1eebc416476
OSDN Git Service
