drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
374,057 Commits 1 Branch 0 Tags
Commit Graph

374057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
669a4497e1 Clean up old Context references in ImsConfig 
Bug: 77941698
Test: Manual
Merged-In: I9d9b5ac97c710b1d742fc25730e3e28172ff75e3
Change-Id: Ieb24830ef60d1bc383639777f8e22d0dc994782a
 2018-06-11 12:59:30 -07:00
Brad Ebinger
0be0692691 Merge "Update Docs to clarify using a Message across IPC" 2018-06-11 19:56:07 +00:00
Andreas Gampe
5b2e5d32d6 Merge "Framework: Disable native-bridge for non-zygote" 
am: 05c09faad2

Change-Id: I2aea1bd9c520ca6bb42bf80bd445da0e86db8136
 2018-06-11 09:11:28 -07:00
Jakub Pawlowski
8d0eb01843 Merge "ScanRecord.getServiceData NPE fix" 
am: d62f74e806

Change-Id: I11a254cf633dc5cf9a7c53c992bf49b00f3d274e
 2018-06-11 09:07:31 -07:00
Treehugger Robot
05c09faad2 Merge "Framework: Disable native-bridge for non-zygote" 2018-06-11 15:23:38 +00:00
Jakub Pawlowski
d62f74e806 Merge "ScanRecord.getServiceData NPE fix" 2018-06-11 14:43:57 +00:00
Jakub Pawlowski
59880123d7 ScanRecord.getServiceData NPE fix 
Bug: 109662587
Change-Id: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a
 2018-06-11 14:43:42 +00:00
Neil Fuller
b557907f51 Minimum viable TimeDetectorService 
This is a do-nothing TimeDetectorService that can be
populated in following commits. A temporary method has been
added so the service has one method.

Unit tests can be run with:

atest FrameworksServicesTests:TimeDetectorServiceTest

Test: build / boot
Test: See above
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
(cherry picked from commit feeee682a23f25760c4a1aa07c00945901911ba3)
 2018-06-11 15:29:57 +01:00
Chalard Jean
9f0df265ba Merge changes Ifd7d73ad,Id79096fa 
am: bfe3b1a691

Change-Id: I263f51ba2aafdf8e19e020b2a4f6ff1b8238fa3c
 2018-06-11 06:12:34 -07:00
Treehugger Robot
bfe3b1a691 Merge changes Ifd7d73ad,Id79096fa 
* changes:
  Bugfixes in LinkProperties#toString
  Cleanup of ConnectivityManager.
 2018-06-11 11:54:21 +00:00
Chalard Jean
faaf2fe700 Bugfixes in LinkProperties#toString 
We should stop trying to use a human brain to write code

Test: manual
Change-Id: Ifd7d73ad65de0f671466080beacbd97287e17bfe
 2018-06-11 18:48:37 +09:00
Chalard Jean
4d660114dc Cleanup of ConnectivityManager. 
This is not exhaustive, but still an undeniable improvement.

Test: runtest frameworks-net
Change-Id: Id79096faf20eec80de7c17b261ef338b895af1e0
 2018-06-11 18:48:37 +09:00
Ryo Hashimoto
9e2177b492 Merge "Use ParcelFileDescriptor's C++ implementation in libbinder" 
am: 20e243d627

Change-Id: I0bc6158d1c37ee8a02450dee55ca6732d878fde3
 2018-06-11 01:25:46 -07:00
Treehugger Robot
20e243d627 Merge "Use ParcelFileDescriptor's C++ implementation in libbinder" 2018-06-11 07:27:41 +00:00
Chalard Jean
4abdbaccb3 Merge "No-op cleanup of ConnectivityService." 
am: a190a41b51

Change-Id: I9ec9633a85b8b2298f90419da2a73c540b6e6805
 2018-06-10 22:09:18 -07:00
Treehugger Robot
a190a41b51 Merge "No-op cleanup of ConnectivityService." 2018-06-11 04:57:31 +00:00
junyulai
0242723e09 Merge "Copy clat modified linkProperties into new one." 
am: 33b5abb6f8

Change-Id: Ia1f9ab3d5c3b889beddb4dda56ad3389c4967275
 2018-06-10 21:44:16 -07:00
Treehugger Robot
33b5abb6f8 Merge "Copy clat modified linkProperties into new one." 2018-06-11 03:26:26 +00:00
TreeHugger Robot
bda7c96038 Merge "Disable the AppOp Restriction for IpSec Tunnels" into stage-aosp-master 2018-06-09 02:06:38 +00:00
Beverly
cad356a9d0 Merge changes from topic "audio-package-update" 
am: 2d5156733c

Change-Id: I051fc7af9663a90ff5b7e080dd44001646d35089
 2018-06-08 17:11:41 -07:00
Jerry Zhang
c2861c5698 Merge "Check for null path in getInternalPathForUser" 
am: 0559afdbcc

Change-Id: I0669f429a389655e04f26ab4cd19fbf69f3dbef1
 2018-06-08 16:55:43 -07:00
Nathan Harold
65406494e7 Disable the AppOp Restriction for IpSec Tunnels 
This CL temporarily removes the AppOp restriction
that disallows creation of IpSec tunnels due to
the lack of the appropriate AppOp in AOSP/master.
When the relevant framework merges out to master,
this CL should be reverted.

Manually merging this due to skipping a merge
conflict at ef9f2740a790feceaa47a24b1a179e93c4ffb5e6

Bug: none
Test: compilation
Change-Id: Ic06c193f85f6bcdd0ead4238825c1add78703cde
 2018-06-08 23:23:04 +00:00
Xin Li
401c4b1d00 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master 
Bug: 79597307
Change-Id: I2ec319e9fc92e959580a4a3cfe955ae91996dc96
 2018-06-08 14:36:39 -07:00
Xin Li
f700e7feaa Skip ef9f2740a7 in proposed pi-dev-plus-aosp-without-vendor merge. 
Bug: 79597307
Change-Id: I8ac04fdd94b069434e2f00b0bfab63eb916f6129
 2018-06-08 14:36:00 -07:00
Treehugger Robot
2d5156733c Merge changes from topic "audio-package-update" 
* changes:
  Include InCallNotification.ogg in AllAudio.mk file
  Add ChargingStarted + InCallNotif to AudioPackage
 2018-06-08 20:47:03 +00:00
Treehugger Robot
0559afdbcc Merge "Check for null path in getInternalPathForUser" 2018-06-08 20:16:14 +00:00
Fredrik Roubert
18d7cd7106 Merge "API updated for ICU4J 61.1" 
am: c2791389a5

Change-Id: I15f620499d0cc69dae06e6d986f8e2d9bcde26a6
 2018-06-08 12:38:06 -07:00
nharold
ef9f2740a7 Merge changes from topic "ipsec-sync-with-pi" 
am: b2749539c0

Change-Id: Ic91ed8f496163c560c6f1fd306bc74e5fecb61c2
 2018-06-08 12:34:09 -07:00
Brad Ebinger
1ff8f364d4 Merge "Adds a private field to parceled data." 
am: 7db23752ab

Change-Id: I9d0bde31a8aeb67b62e202b3b8946b066b81d186
 2018-06-08 12:27:22 -07:00
Brad Ebinger
a56e388a75 Merge "Unhide @SystemApi Constructor" 
am: 442b546e2a

Change-Id: Ie6281283f6605b7125882698333644843838e2ef
 2018-06-08 12:21:11 -07:00
Jerry Zhang
30f63cf1f9 Check for null path in getInternalPathForUser 
In some situations, path could be null resulting
in a crash.

Test: no crash
Bug: 109730998
Change-Id: I2ce0410162d1327905d690331f461f9187e20906
(cherry picked from commit 6f6154bf0493cf66628c8f2418827fe54679b1eb)
 2018-06-08 11:26:33 -07:00
Treehugger Robot
c2791389a5 Merge "API updated for ICU4J 61.1" 2018-06-08 17:19:55 +00:00
nharold
b2749539c0 Merge changes from topic "ipsec-sync-with-pi" 
* changes:
  Disable the AppOp Restriction for IpSec Tunnels
  Rework Exception Handling for IpSecManager
  Update IpSecManager to use InetAddress and prefixLen
  Add AppOps Checks for MANAGE_IPSEC_TUNNELS
  Add MANAGE_IPSEC_TUNNELS Permission
 2018-06-08 17:07:11 +00:00
Brad Ebinger
7db23752ab Merge "Adds a private field to parceled data." 2018-06-08 17:03:14 +00:00
Brad Ebinger
442b546e2a Merge "Unhide @SystemApi Constructor" 2018-06-08 17:02:48 +00:00
David Brazdil
bd0dd0e59f Merge "Build dark greylist from public + light grey API" 
am: 60229832de

Change-Id: I7a0077ed63f17e4a60482fad3f39ee1ab2d89461
 2018-06-08 09:10:52 -07:00
David Brazdil
60229832de Merge "Build dark greylist from public + light grey API" 2018-06-08 14:22:26 +00:00
Fredrik Roubert
267f1ca774 API updated for ICU4J 61.1 
Bug: 77634530
Bug: 109837373
Test: make
Test: cts-tradefed run cts-dev -m CtsIcuTestCases -t android.icu.dev.test.format.MeasureUnitTest
for CTS coverage
Change-Id: I721fbef5c79df1310e144a48ab2f18929b10bdfa
 2018-06-08 13:39:46 +00:00
Chalard Jean
99cf81acac Merge "Opportunistic typo fix" 
am: 6b03498a54

Change-Id: Id6dc12172a9fb1980a598ba070af1b10b1738849
 2018-06-08 06:01:27 -07:00
Treehugger Robot
6b03498a54 Merge "Opportunistic typo fix" 2018-06-08 11:51:29 +00:00
Chalard Jean
4133a12431 No-op cleanup of ConnectivityService. 
Funny how these things accumulate. Not exhaustive of course, but
still an improvement.
- Remove unused imports.
- Remove unused variables and members.
- Replace members with locals where applicable.
- Remove useless type parameters and explicit unboxings for Java 7.
- Conversely add the diamond operator for auto-genericity for
  Java 6.
- Reduce visibility of members where possible.

Test: runtest frameworks-net
Change-Id: I13586aee09b4cd1c87c525fafb5eee44dedb5360
 2018-06-08 19:10:59 +09:00
junyulai
cafa7c939d Copy clat modified linkProperties into new one. 
updateLinkProperties copied the linkProperties in networkAgent,
but the clat fix-up function did not copy stacked link into new one.
This caused an incorrect clat iface removal, and the IPv4 network
 to be unreachable.

Clean cherry-pick of ag/4260470

Bug: 80261579
Test: 1. ping after ipv6 only data call with 2g voice call on/off
      2. runtest frameworks-net
      3. run cts -m CtsNetTestCases
Change-Id: Ide47a3b0680dddfcf3e2e759a59b19aee3605050
 2018-06-08 16:28:32 +09:00
Chris Forbes
27213a3120 Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev 
am: 551328eaaa

Change-Id: I4f9a420dcefb53e767a745f595787b71fcacd228
 2018-06-07 22:23:29 -07:00
Chris Forbes
551328eaaa Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev 2018-06-08 05:14:12 +00:00
Svet Ganov
cbd47f7937 Merge "Don't access keyguard from instant apps." into pi-dev 
am: e7bd4e7e8f

Change-Id: I5d5d8ea0c7b5756143b5140e4cf16ae584147345
 2018-06-07 22:12:45 -07:00
TreeHugger Robot
e7bd4e7e8f Merge "Don't access keyguard from instant apps." into pi-dev 2018-06-08 04:49:39 +00:00
Eric Laurent
e5c4aac7e5 [automerger skipped] Merge "Add field to set A2DP device volume on connect (1/2)" am: 1b9de57f38 
am: fe96bd9c72  -s ours

Change-Id: Ife1a1762bba30d0a24919498c8b5c06b5639ac92
 2018-06-07 21:43:53 -07:00
Android Build Merger (Role)
6947fbbdd0 Merge "Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev am: eaf3590eda" into pi-dev-plus-aosp 2018-06-08 04:19:01 +00:00
Adam Powell
f8677d0b41 Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev 
am: eaf3590eda

Change-Id: I569a2caf105c4b6cf60b81026567ef4af7ca31c9
 2018-06-07 21:18:10 -07:00
Android Build Merger (Role)
80c239c46a Merge "Merge "Add filter for NoPreloadHolders" am: 88ee5c93bb am: 202e61f127" into pi-dev-plus-aosp 2018-06-08 04:15:24 +00:00