Commit Graph

85462 Commits

Author SHA1 Message Date
Xin Li
626cac9fdf DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: I481d824726ae0260b42cd7a4acc1c6fce593c324
2019-07-09 15:13:36 -07:00
Fedor Kudasov
2e5319117a Merge changes from topic "fix_master_build"
* changes:
  Revert "Cherry-pick the relevant parts of master change"
  Revert "Remove providesRoutesToMostDestinations."
2019-07-09 09:32:23 +00:00
Fedor Kudasov
559e91e0ef Revert "Cherry-pick the relevant parts of master change"
This reverts commit dd16d44fe8.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b
2019-07-09 09:29:17 +00:00
Fedor Kudasov
e5cb0a2216 Revert "Remove providesRoutesToMostDestinations."
This reverts commit d85b09a06f.

Reason for revert: multiple build breakages b/137069068

Change-Id: I60a4f71e13fe82f970b177a07c0b58439cbc64ff
2019-07-09 09:23:25 +00:00
Neil Fuller
db31e6d07a Merge "Switch widgets away from android.text.format.Time" 2019-07-09 08:15:10 +00:00
Chalard Jean
d85b09a06f Remove providesRoutesToMostDestinations.
This function is not used any more.

Test: FrameworksNetTests
Change-Id: Ia43f8811cb9d575e16735b0f4b76d91e7cd42ebc
2019-07-08 20:36:33 +09:00
Chalard Jean
dd16d44fe8 Cherry-pick the relevant parts of master change
I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict

Test: atest FrameworksNetTests
Change-Id: I7de4f67234bf97d58bddffa22272c7670398f56d
2019-07-08 20:25:45 +09:00
Nikita Ioffe
f585ed0459 Use ApexInfo.moduleName
See another CL in the topic

Bug: 132428457
Test: builds
Change-Id: I87ba3fb539d0761c515adc8e2d2acc8dfc5e6a9a
Merged-In: If0bd3d368c7373ab0028211a8a4246a9821893af
2019-07-04 15:46:08 +00:00
Nazanin Bakhshi
1ca89a995b Merge "Add device identifier permission checks to TelephonyPermissions" 2019-07-01 23:26:18 +00:00
Michael Groover
94672cea7c Add device identifier permission checks to TelephonyPermissions
Bug: 131916175
Fixes: 136305129
Test: atest PhoneSubInfoControllerTest
Change-Id: Icca98347ab76b7c3468b95756a33a758a3abde37
Merged-In: I3c82c53ec89cd17b34a61166ccc9e9747388efac
2019-07-01 17:53:11 +00:00
Lorenzo Colitti
b5ad613839 Unit tests for new explicitlySelected behaviour.
ag/7905088 added the ability to pass in acceptUnvalidated without
passing in explicitlySelected. Add unit tests for that code.

While I'm at it, convert a couple of "== 1"s to toBool(), and
update the comments in NetworkAgent.

Bug: 130766237
Test: atest FrameworksNetTests
Change-Id: I6b550bd621e3596975f83464c7b4b8a14269120b
2019-06-28 23:57:22 +09:00
Lorenzo Colitti
63f94f411b Merge "Remove all static members from NetworkStatsFactory." 2019-06-28 01:59:31 +00:00
Janis Danisevskis
ecf4d59309 Merge "Gatekeeper generated aidl cpp bindings" 2019-06-28 00:43:10 +00:00
Treehugger Robot
874b481cdf Merge "Stable seek bar positioning" 2019-06-27 22:02:06 +00:00
Lorenzo Colitti
4aa8760a68 Remove all static members from NetworkStatsFactory.
NetworkStatsFactory is owned by NetworkStatsService, and any
accesses to NSF data should go through NSS.

Test: atest FrameworksNetTests
Change-Id: Idbd0dbbaeb11313f63474e7ec0e01f974349fc89
2019-06-27 17:39:05 +09:00
Neil Fuller
d854e6e0b4 Merge "Track change of type from short -> int" 2019-06-27 08:26:31 +00:00
Lorenzo Colitti
bd94f0afd2 Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." 2019-06-27 07:53:30 +00:00
Lorenzo Colitti
8b577139ae Transfer ownership of NetworkStatsFactory to NetworkStatsService.
NetworkStatsService is the only consumer of the data coming from
NetworkStatsFactory, but the factory itself is instantiated and
owned by NetworkManagementService.

Move it into NetworkStatsService instead.

Test: atest FrameworksNetTests
Change-Id: I52df1e545c646927952579da22845a12d1d7563b
2019-06-26 19:29:51 +09:00
Felix
2deb9b54d9 PhoneWindowManager/KeyEvent: Camera key as WakeKey
As discussed in https://r.android.com/973723

This makes any camera key event wake up the device.
Handling of the camera key apart from waking up the device might follow
in a later commit.

Signed-off-by: Felix <google@ix5.org>
Change-Id: I44dbc3f9ac465f664b6d740cb6a056b7f6e118fb
2019-06-25 06:41:12 +02:00
Janis Danisevskis
9aa7223119 Gatekeeper generated aidl cpp bindings
Moved Gatekeeper aidl definitions to system/core/gatekeeperd.

Test: Manually tested setting PIN.
      android.keystore.cts.CipherTest#testCanCreateAuthBoundKeyWhenScreenLocked
      android.keystore.cts.CipherTest#testKeyguardLockAndUnlock
Change-Id: Ie3583f5682727b1f9a82d270764c94fce33388ec
Merged-In: Ie3583f5682727b1f9a82d270764c94fce33388ec
2019-06-23 11:19:58 -07:00
Steven Moreland
f54791b388 Remove references to setPermissionController.
This method isn't implemented/used/etc..

Bug: 135768100
Test: TH
Change-Id: Ic2e27f5685cc16562815fcaf1226bc7789f8d882
2019-06-21 18:51:07 -07:00
Steven Moreland
3feab1b474 ServiceManagerNative: delete unused methods
This class is never instantiated (and should be deleted in the future),
doesn't need to inherit from anything, and only has one method that is
used (to get an instance of BpServiceManager defined here). Deleting
unused code, and we can delete the class once apps stop linking against
it.

Bug: 135768100
Test: TH
Change-Id: Ie19e099551b10599a4b7bab29b35d78d66cd3442
2019-06-21 18:28:55 -07:00
Sergey
24a89b4816 Stable seek bar positioning
Touching the thumb on the Seek bar prevents the thumb from immediately jumping to a new position and changing the progress of the Seek bar.

Test: Place your finger on the seek bar thumb so that your finger touches the thumb. Take your finger away. Seek bar should not change progress and thumb's position.
Place your finger on the seek bar thumb so that your finger touches the thumb. Seek bar should not change progress and thumb's position. Then, without lifting your finger from the screen, move your finger towards the maximum or minimum value. Seek bar thumb should follow your finger while maintaining its position relative to your finger.

Change-Id: Ia72d247662ad5b8dd66d0b0578098b9a2b6060cd
2019-06-21 16:20:27 +04:00
Neil Fuller
f8d8fc1247 Track change of type from short -> int
Remove (now) unnecessary cast: PacketSocketAddress
uses ints.

Bug: 124232146
Bug: 135660232
Test: build only
Change-Id: Ifa99e0d2e970f1b8f605afe8a394c4f575bc6eca
2019-06-20 17:09:40 +01:00
Neil Fuller
2d24f7a39e Merge "Switch to a single PacketSocketAddress constructor" 2019-06-20 14:09:15 +00:00
Neil Fuller
6ae89f2f9c Switch to a single PacketSocketAddress constructor
Switch to a single PacketSocketAddress constructor to
avoid multiple unnecessary overloads in the
Core Platform API.

Bug: 133196453
Bug: 124232146
Test: build only
Change-Id: I30533ac3aa99c2cd09e8c624fedf6000b0f52c11
2019-06-20 09:24:43 +01:00
Chalard Jean
9c0ff1b005 Factorize custom asserts.
Also a few utilities that were in the way, and some opportunistic
cleanups.

Test: FrameworksNetTest NetworkStackTest
Change-Id: I385070e2044fd967cb18f1ffea9a86a4627b742e
2019-06-20 16:24:25 +09:00
Junyu Lai
579a99e558 Merge "Move the test of minimum supported keepalive slots to CTS" 2019-06-19 14:08:31 +00:00
Junyu Lai
68a4599a37 Merge "Correct value of supported keepalive count for cellular" 2019-06-19 14:08:31 +00:00
Andrei-Valentin Onea
3647eb620b Merge "Document public alternatives to greylisted APIs" 2019-06-19 13:57:08 +00:00
junyulai
edde28b709 Move the test of minimum supported keepalive slots to CTS
This change also enables log when keepalive is started.

Bug: 134352656
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest FrameworksNetTests
Change-Id: I408750fa0bceb0c1c26afb5fead4e44fb824fbc1
2019-06-19 16:25:19 +08:00
Neil Fuller
0bab7fa512 Switch widgets away from android.text.format.Time
android.text.format.Time is limited to 32-bit seconds from the
beginning of the Unix epoch and so classes that use it are limited
to 1901 - 2038. Switching to java.time avoids this issue.

Manual Testing:

AnalogClock is deprecated and not used anywhere so difficult to
test.

DateTimeView is used in the status bar. Behavior was verified with
current date/time and also Europe/London around 2019-03-31 01:00
(skip forward) and around 2019-10-27 02:00 (fall back). The time picker
in settings uses android.icu.util.Calendar which favored the later time
if there are two local times with the same display time (e.g. the
fall back case). The "repeat" case was tested with "date @1572137900"
to set the clock to "the first" 01:58, then waiting 2 minutes to
ensure that the 01:59 -> 01:00 transition occurs correctly.

Bug: 16550209
Test: build / boot / treehugger
Test: See above
Change-Id: Ibadad3041a2e54fe12d347960bf1e0f3ebe10c01
2019-06-18 15:29:41 +01:00
Varun Anand
f4c10e8bc2 Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459
* changes:
  Remove VPN info arrays from NetworkStats(Observer|Recorder)
  NetworkStatsFactory: Take VPNs into account for network/battery stats
  Remove duplicate line in clat_simple test file
  Remove unused lastStats parameter
  Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
2019-06-17 15:56:24 +00:00
Chalard Jean
2253ff94e3 Remove the <= P restriction for WIFI_P2P
This is still sent in an intent.

Bug: 975059
Change-Id: I56c86b0c1912064d5a642991df32d2cefb6a8d5b
2019-06-17 19:46:34 +09:00
Andrei Onea
f950c08b78 Document public alternatives to greylisted APIs
Add known public alternatives or recommendations for greylisted APIs in
Bluetooth.

Bug: 135171386
Test: m
Change-Id: I86e708be37eb7d1b0fafa2d64283b7f81bc02e51
2019-06-17 11:29:45 +01:00
Benedict Wong
9fbbdebc61 NetworkStatsFactory: Take VPNs into account for network/battery stats
This change fixes detailed UID stats to ensure network and battery stats
both take VPNs into account. NetworkStatsFactory is being made aware of
VPNs enabled, and the full set of underlying networks present.

Since traffic can only be migrated over a NetworkStats delta, NSF
maintains a NetworkStats snapshot across all UIDs/ifaces/tags.

This snapshot gets updated whenever NSF records a new snapshot
(based on various hooks such as VPN updating its underlying networks,
network getting lost, etc.), or NetworkStatsService's
getDetailedUidStats() method being called.

This change widens the scope of the existing mPersistentSnapshot lock,
renaming it to mPersistentDataLock, and ensures that TUN migrations are
not done in parallel. Additionally, mVpnInfos is updated via
pointer-swapping, to reduce the scope of the mPersistentDataLock.

The safety of this change is predicated on:
1. NetworkStatsFactory lock not held, so services cannot deadlock through
the cyclical lock.

2. The broadening of the scope of the lock in NetworkStatsFactory has no
threading implications, as it is always the last (leaf node) lock held,
and therefore is impossible to have lock inversion.

Additionally, to ensure VPNs work with 464xlat, the VPN info passed to
the NetworkStatsFactory includes all underlying interfaces, instead of
only passing the first one.

This (partially) re-applies changes from:
aosp/972848: Add one more test for VPN usage stats.
aosp/972847: Addressing comments for http://ag/7700679.
aosp/885338: NetworkStatsService: Fix getDetailedUidStats to take VPNs
             into account.
Co-developed with: Varun Anand <vaanand@google.com>

Bug: 113122541
Bug: 120145746
Bug: 129264869
Bug: 134244752
Test: FrameworksNetTest passing
Test: Manual tests show data usage fixes maintained.
Change-Id: I6466ec1411fc5ed6954125d27d353b6cd1be719e
2019-06-14 11:41:31 -07:00
Treehugger Robot
8fdfd917d1 Merge "Declare STATE_AUDIO_CONNECTED in right place" 2019-06-14 07:12:26 +00:00
Benedict Wong
a84d9fa572 Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
This reverts commit d8220c2050.

Reason for revert: Fix available for deadlocks.

Bug: 134244752
Change-Id: Ib65214598837289bd39dbf040b56ab7835f893ba
2019-06-13 15:36:27 -07:00
Treehugger Robot
6b6b3322fc Merge "Update Secure NFC API definitions" 2019-06-13 04:07:54 +00:00
Ruchi Kandoi
6cc1ebe1e6 Update Secure NFC API definitions
Bug: 124767797
Test: None
Merged-In: If78d90fdc0a24d5f44bbb582f388a9c60b12786c
Change-Id: If78d90fdc0a24d5f44bbb582f388a9c60b12786c
2019-06-12 11:16:08 +00:00
Varun Anand
8af90ce15b Merge changes from topic "vpn_data_accnt_revert"
* changes:
  Revert "Take all VPN underlying networks into account when migrating traffic for"
  Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
  Revert "Addressing comments for http://ag/7700679."
  Revert "Add one more test for VPN usage stats."
2019-06-12 01:05:01 +00:00
Aaron Huang
c0de2838e7 Correct value of supported keepalive count for cellular
Cellular only supports 1 keepalive connection so correct the default
supported value to 1.

Bug: 134037217
Test: - atest FrameworksNetTests
      - atest android.net.cts.ConnectivityManagerTest \
        #testSocketKeepaliveLimitTelephony

Change-Id: Ia3761f2e78d54866bb2e156d58004396bbc8adc3
2019-06-11 22:04:34 +08:00
Luke Huang
5b31126c9d Fix race condition caused by fd reused for DnsResolver
There might be a gap between fd close and fd event listener unregister.
If fd is reused for another query during that gap, it might cause the
query failed with no response since addOnFileDescriptorEventListener
method failed. To fix this problem, we must ensure that fd event
listener is unregistered before fd closing.

Bug: 134310704
Test: atest DnsResolverTest
Change-Id: Ifb6bd34dc54dcf1c61fe8b87785124df4bc0f410
2019-06-11 15:18:28 +08:00
Varun Anand
d8220c2050 Revert "Take all VPN underlying networks into account when migrating traffic for"
This reverts commit 95aa6d446f.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I2f1839d7776a613ca571af8a542755ddc5fc8760
Merged-In: Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9
2019-06-10 16:00:48 -07:00
Varun Anand
6a04d49ff2 Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
This reverts commit 29d2ef2fe1.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I37f75c2b243ea548a88ef1dae88287405c6ef55f
Merged-In: I0c00e8f0e30cee987b71b561079a97bf09d4dae4
2019-06-10 16:00:38 -07:00
Varun Anand
4f16107e3c Revert "Addressing comments for http://ag/7700679."
This reverts commit e4bfdccb57.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I12ab724e2ef8a5c1b42078330ba74713ff86fdd1
Merged-In: I5fbb3443a39a21fc9d96442726cd10d20e8d61cd
2019-06-10 16:00:28 -07:00
Al Sutton
c2fb67f846 Update services/backup OWNERS to be current B&R team
Change-Id: Ic5e0c5a1f5e9a3f87647187f0f63d61a2b7a19b2
Merged-In: I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e
Merged-In: I03d72ecec447304866d96e2f0908acbc2a1796b6
Merged-In: I69f6419055be4adc974041d78a1517ded7e5c57b
Test: build/make/tools/checkowners.py -c -v OWNERS
Bug: 134730213
2019-06-07 11:20:19 +01:00
Treehugger Robot
a677e4d5a0 Merge "Delete ByteStringUtils: it is no longer used" 2019-06-06 12:51:23 +00:00
Treehugger Robot
9d519d808f Merge "Frameworks: Slightly refactor Parcel code" 2019-06-05 18:13:36 +00:00
Lorenzo Colitti
79e58ad901 Merge "Allow passing in acceptUnvalidated without explicitlySelected" 2019-06-05 05:00:14 +00:00