344837 Commits

Author SHA1 Message Date
Andreas Gampe
ae5bcc56ac ActivityManager: Fix slow-app ANR dumping
Update for current tombstoned-managed dumping.

Bug: 77288304
Test: m
Change-Id: If3d0671ad0fc173f393c1c6e1c537323b8df2b0f
2018-05-07 10:47:25 -07:00
android-build-prod (mdb)
b466949e32 Merge "Convert to Soong" 2018-05-05 14:43:45 +00:00
Dan Willemsen
0dec58456f Convert to Soong
See build/soong/README.md for more information.

Test: cd frameworks/base/cmds/backup mma
Change-Id: I88a45ae568f80228c70f3e4a4a1facaff9520587
2018-05-04 23:17:00 -07:00
Calin Juravle
7a514d6327 Properly prepare system server profiles
Update the logic for system server profiles to work without disabling
SELinux policies.

Test: check that system_server profile is created without disabling
SElinux

Bug: 74081010

(cherry picked from commit 3f3a08ad0d93e29703597f780ff7d1b3b4a1facb)

Merged-Id: I63ffadfbe6850992634d0720fb077a4dc65b5736
Change-Id: I63ffadfbe6850992634d0720fb077a4dc65b5736
2018-05-04 16:23:32 -07:00
android-build-prod (mdb)
b0ae3e5bfc Merge "AudioService: fix uid check in setBluetoothScoOn" 2018-05-04 23:19:19 +00:00
Andreas Gampe
95c5e5c1fd Merge "Framework: Remove ART tombstoned config" 2018-05-04 22:02:14 +00:00
Jack Yu
72cf718d20 Merge "Enabled area info update for India" 2018-05-04 16:52:01 +00:00
Calin Juravle
8eb891be6f Make system server profiling an explicit runtime intent
Pass an explicit flag to the runtime when we need to profile the system
server. This ensures that we only start the ProfileSaver and allocate the
code cache when needed.

Test: manual, on a device with system server profiling enabled
Bug: 74081010
Change-Id: I5647e0bfb47d31c0e39bb3f59650cc956f49c4db
2018-05-03 20:06:10 -07:00
Kirill Grouchnikov
ce93a98e4f convert Uibench test to aapt2
Bug: NA
Test: build
Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
Merged-In: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
(cherry picked from commit bffef1f024fbd7fb005a73d0744d7f8ee019fd27)
2018-05-03 16:38:17 -07:00
Aurimas Liutikas
d6c9658d99 Migrate PrintSpooler to aapt2.
Test: make -j PrintSpooler
Change-Id: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4
Merged-In: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4
(cherry picked from commit 87f7ce4bd17b4d1cd0721b7b0d05f57ffdef8a0d)
2018-05-03 16:38:17 -07:00
Alan Viverette
2789e544f1 Migrate to AAPT2
Bug: 73128633
Test: make checkbuild
Change-Id: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
Merged-In: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
(cherry picked from commit e3264ba6cf7df5b33b10dd6a15ac5010c78bac6e)
2018-05-03 16:38:17 -07:00
Andreas Gampe
4b4287f072 Framework: Remove ART tombstoned config
The explicit option is no longer supported.

Bug: 77288304
Test: m
Test: device boots
Test: ANR dumps work
Change-Id: I1ffcf0593e1f6591d1b33882edf79381e59c2121
2018-05-03 14:25:14 -07:00
android-build-prod (mdb)
e7b05b8797 Merge "Fix spelling errors in BluetoothGatt documentation" 2018-05-03 20:47:01 +00:00
Stanley Tng
505c05839b Fix spelling errors in BluetoothGatt documentation
Correct "paramter" to "parameter". Correct "connectoin" to connection.

Bug: 79198797
Test: Compile
Change-Id: I98646eec66da2aaa6f74ae2db35ea914c6a105a1
2018-05-03 20:43:40 +00:00
Jack Yu
d807aeba4d Enabled area info update for India
We only enabled for MCC 404 before. Now we enable
MCC 405 as well.

Test: Manual
Bug: 69725276
Merged-In: Icc42fe114195c08709a4e601d7fc139041ca878f
Change-Id: Icc42fe114195c08709a4e601d7fc139041ca878f
(cherry picked from commit 89081f4f61811e3a2078871aa1ef953a894f672a)
2018-05-03 11:12:46 -07:00
android-build-prod (mdb)
1c4a22fb08 Merge "Framework: Restrict warning message" 2018-05-03 15:31:18 +00:00
David Brazdil
01678299ce Merge changes I4e13e5da,I68582cf0,I528a70cc
* changes:
  Remove hiddenapi-blacklist.txt
  Update hiddenapi-p-light-greylist.txt
  Add rule to build hidden API blacklist
2018-05-03 14:15:13 +00:00
David Brazdil
b545e03683 Remove hiddenapi-blacklist.txt
Create an empty file in the build rule instead. Do not merged this
beyond AOSP. We have an implicitly built blacklist everywhere else.

Bug: 64382372
Test: make
Change-Id: I4e13e5daf635934a152d389a95bf45c482b5a87f
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
2018-05-03 12:14:45 +01:00
Erik Kline
8285261133 Merge "Add static IpClient logging" 2018-05-03 10:44:30 +00:00
David Brazdil
acad03efab Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I68582cf087b2e92f10b86c7c5a8bcd095e80ffab
2018-05-03 10:55:34 +01:00
David Brazdil
cc88bdc14c Add rule to build hidden API blacklist
Add a new Makefile rule 'hiddenapi-b-blacklist' which takes the
manually published hiddenapi-p-light-greylist.txt and subtracts it
from private-dex.txt built for the current branch. This is meant to
provide an approximation of the blacklist in internal branches.

Bug: 64382372
Test: make hiddenapi-aosp-blacklist
Change-Id: I528a70cc6a71e988b53d94ca7ef81d6c181e5153
2018-05-03 10:54:26 +01:00
Erik Kline
c172c7d815 Add static IpClient logging
Support keeping IpClient logs around and dumping them
during dumpsys.  Previously we got this benefit for
wifi by virtue of WifiStateMachine's long-lived nature.
Now that this is changing we need to be sure we have
logs, and this method gets us Ethernet logs as well.

Bug: 62476366
Bug: 77999594
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - dumpsys connmetrics [ipclient] works
Merged-In: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
Merged-In: Ie947394fabcaca7fc1d067f095c2442ee2704593
Change-Id: I1136a83de8097fdb4130debe1eaf689be7132fe5
(cherry picked from commit 3f8306b8c56b58054800a576912204e8bf66f9f4)
2018-05-03 18:00:09 +09:00
android-build-prod (mdb)
17280c61d3 Merge "don't block adb while running uninstall" 2018-05-02 21:27:00 +00:00
Vitor Albuquerque
c3bb48ccfd AudioService: fix uid check in setBluetoothScoOn
Calling UID is now checked in setBluetoothScoOn and only allow
route to change if request comes from a system component.

The check was not taking into account secondary users, hence
causing failure to route audio to SCO when secondary users
were active.

This change makes sure we are checking the correct app id,
without taking into account the user id.

Bug: 74057977
Test: SCO call using Guest User

Change-Id: I3e26dedb6333a85b315073fe4830c4d1b8070742
2018-05-02 20:36:54 +00:00
wangmingming1
0f8da1c877 don't block adb while running uninstall
Test: Manual
      1. setup a work profile
      2. set a uninstall restriction on foo app for the work profile
         by calling set DevicePolicyManager.setUninstallBlocked()
      3. observe adb uninstallation can return with 'DELETE_FAILED_OWNER_BLOCKED'
         message without blocking forever by using the following command line:
         `adb uninstall --user user-id-of-work-profile com.foo`
Test: Manual
      1. install lots of apks via adb
      2. uninstall apks via adb

Change-Id: I68706782ae547250433e3dd8ff285d4932473033
Merged-In: If89978c5a79ef998bde55c254ced4b6a3ff6e645
Signed-off-by: wangmingming1 <wangmingming1@xiaomi.com>
2018-05-02 18:28:36 +00:00
Anton Hansson
85e68063a9 Merge "frameworks/base: Update a few more references to android.jar." 2018-05-02 15:31:27 +00:00
David Brazdil
c859c8097b Merge "Build same hidden API lists as in pi-dev" 2018-05-02 10:40:37 +00:00
David Brazdil
96c9cbc1a1 Build same hidden API lists as in pi-dev
P branch builds hidden API lists in a separate invocation of droiddoc
which includes @SystemApi and @TestApi annotated class members in the
public API. This patch creates the same build rule in the master branch,
only with Soong instead of Makefile.

Test: make out/soong/.intermediates/frameworks/base/hiddenapi-lists/android_common/private-dex.txt
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: I80860c2b9f7213db65d0a9ca65bd645187aa0ce0
2018-05-02 08:54:02 +00:00
David Brazdil
0835de9e17 Merge "Publish hidden API light greylist from P" 2018-05-02 08:42:49 +00:00
Remi NGUYEN VAN
e025d4deaa Fix testUidPoliciesToString
The test is likely failing since go/ag/1344349 because of a bad
copy-paste between patchsets 6 and 7.

Test: test now passes
Change-Id: I87341c4f4db1e7b61c3899368b24ea484fe8bfd1
2018-05-02 17:34:12 +09:00
Remi NGUYEN VAN
14178014fc Fix testRegisterUsageCallback
noteOp (introduced in go/ag/3897834) checks that the calling uid matches
the calling package, which is not correct when using a fake calling
package. Use the real package of the test so permissions are checked
properly.

The test currently only fails this way in pi-dev as noteOp is only used
in pi-dev.
Change-Id: I9ac3717af9335ba9efa0b8842a2df0d7b69ec9ab
Test: Fixed test now passes in pi-dev
Bug: b/78487385
2018-05-02 16:51:13 +09:00
android-build-prod (mdb)
90c01b0093 Merge changes from topic "ifaceStats"
* changes:
  Remove the unused file parsing function
  Use eBPF map data for per iface stats
2018-05-02 01:19:23 +00:00
Chenbo Feng
b815c978b8 Remove the unused file parsing function
With the new xt_bpf support for iface stats. We no longer need to parse
the per interface stats from /proc/net/dev. And since the old xt_qtaguid
code path also not depend on it, we can completly remove that helper
function since no caller is depending on it now.

Bug: 72111305
Test: runtest frameworks-net -c com.android.internal.net.NetworkStatsFactoryTest
Change-Id: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
2018-05-01 14:13:55 -07:00
Chenbo Feng
dcc56783f5 Use eBPF map data for per iface stats
After adding the xt_bpf module and ifaceStatsMap, eBPF tool can now
support reading per interface data. So networkStatsFactory should move
away from parsing proc/net/dev and use the eBPF map stats instead.

Bug: 72111305
Test: atest com.android.server.net.NetworkStatsServiceTest
Change-Id: Ibcc6150d00835b3bd33af22a72e4a86e172581cf
2018-05-01 14:13:48 -07:00
Andreas Gampe
f13e473ee1 Framework: Restrict warning message
Only print the message of the cache wasn't pruned.

Bug: 26978865
Test: manual
Change-Id: I564ecddf6c8fafcc9699ec6bfbd622214edf79c8
2018-05-01 12:10:54 -07:00
Anton Hansson
0c70390040 frameworks/base: Update a few more references to android.jar.
These files are moving. Update the paths so that the old files can be
deleted.

Bug: 77525052
Test: ./build for one of these scripts
Change-Id: Iacca1f1930d6a2614866f6503a2b4c1eba4d4018
2018-05-01 18:34:10 +01:00
Rubin Xu
2ea6c55590 Add permission check to setAllowOnlyVpnForUids
Bug: 63000005
Test: runtest frameworks-net -c com.android.server.connectivity.VpnTest
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnLockDown
Change-Id: Ia1a82ee73d8617f3124032986fe6c09c14bf7752
(cherry picked from commit be806661d0967ddabbeb444cccc939039f3e5e81)
2018-05-01 12:18:38 +01:00
Chalard Jean
59e139a767 Merge "Let DnsManager fill in LinkProperties for private DNSes" 2018-05-01 03:07:35 +00:00
android-build-prod (mdb)
9b1c3e00bf Merge changes Ie4709b6e,I57980ccb
* changes:
  com.android.nfc_extras is built with java_sdk_library
  Fix link-type check warning on com.android.nfc_extras
2018-05-01 01:31:31 +00:00
android-build-prod (mdb)
d1ed784438 Merge "Get/Set IO capability of Bluetooth device" 2018-04-30 20:37:46 +00:00
Stanley Tng
3f3cf58813 Merge "Disable Hearing Aid Profile for all platforms except Pixels" 2018-04-30 19:48:36 +00:00
Ajay Panicker
5528d0a9a6 Merge "Don't set Bluetooth volume when the Bluetooth stream changes" 2018-04-30 18:06:15 +00:00
Stanley Tng
8c0f800831 Disable Hearing Aid Profile for all platforms except Pixels
Add code to selectively disable Hearing Aid Profile depending on the
config.xml file.
Note: Cherry-picked from internal branch.

Bug: 78142728
Test: Manual Pairing on various Pixel phones
Change-Id: I8094f1a1665647b026eb9601e032fb7fbb816ec6
(cherry picked from commit a21efa58369b304e5ea818a3f8b1577f1fed3d02)
2018-04-30 08:54:47 -07:00
Pulkit Bhuwalka
979698bc2c Get/Set IO capability of Bluetooth device
Creates the hidden BluetoothAdapter APIs which can be used to
control IO capability settings on the local Bluetooth device.

Bug: 36015413
Test: Used a test activity to control getting/setting the value and
attempting pairing.

Change-Id: Ibbfdc5ae5a1d56c6e3d003ab3bf5d095dcb583e4
(cherry picked from commit 6043b7b90a27a836241bfc05e71eb46ce04c66cf)
2018-04-28 13:45:44 -07:00
Shuo Qian
093ade312d Merge "Restore the OEM hook implementation and usage" 2018-04-27 18:39:20 +00:00
Ajay Panicker
085ecc32a4 Don't set Bluetooth volume when the Bluetooth stream changes
Don't restore the remembered volume whenever an Bluetooth A2DP stream
comes up or whenever Bluetooth AVRCP reports absolute volume support.
All Bluetooth volume memory will now be handled by Bluetooth.

Bug: 30602783
Test: See that AudioService doesn't try to change the volume when a
Bluetooth device connects.

Change-Id: I683062c1a0565591ae33cbbb0381730b86ad17c2
2018-04-27 14:16:56 +00:00
Jiyong Park
611b7f4ec9 com.android.nfc_extras is built with java_sdk_library
Remove the biolerplate code using java_sdk_library module type.

Bug: 77575606
Test: m -j

Change-Id: Ie4709b6ebc18bc2e4e26137d4a097d734f4435fe
2018-04-27 16:34:29 +09:00
android-build-prod (mdb)
1100e84175 Merge "Add the list of private DNS addresses to LinkProperties" 2018-04-27 04:53:52 +00:00
Chalard Jean
f97656b81c Let DnsManager fill in LinkProperties for private DNSes
(clean cherry-pick from ag/3880157)

Test: new tests pass
Bug: 73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610
Merged-In: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811
Merged-In: I72ecaa4f7d7320ffa2e0ba82fadafc947c8a6981
2018-04-27 13:32:10 +09:00
Chalard Jean
03dbf6bd5e Add the list of private DNS addresses to LinkProperties
(clean cherry-pick from ag/3874803)

Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
Merged-In: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
Merged-In: I6bdbef78d078d68534c8e07e9af031ce374560ef
2018-04-27 13:32:10 +09:00