OSDN Git Service
android-build-prod (mdb) [Mon, 7 May 2018 21:22:49 +0000 (14:22 -0700)]
Merge "Move SettingsLib tests and EasterEgg to aapt2."
am:
846fbd0806
Change-Id: I4d616697988a569b53d0dec1e4b674e455ae1307
android-build-prod (mdb) [Mon, 7 May 2018 20:05:54 +0000 (20:05 +0000)]
Merge "Move SettingsLib tests and EasterEgg to aapt2."
Colin Cross [Mon, 7 May 2018 19:26:15 +0000 (12:26 -0700)]
Merge changes from topic "soong_support_libs"
am:
3e20d23cf7
Change-Id: Iafd7255c47e296f3054466c35af8e19a6566879f
Aurimas Liutikas [Mon, 7 May 2018 19:21:45 +0000 (12:21 -0700)]
Migrate PrintSpooler to aapt2.
am:
d6c9658d99
Change-Id: I64afdc062304c04a8f28d56cad0d4b32ba3c9d10
Alan Viverette [Mon, 7 May 2018 19:16:58 +0000 (12:16 -0700)]
Migrate to AAPT2
am:
2789e544f1
Change-Id: I2b506b69bb0822cd22d38516e65896e74495a689
Aurimas Liutikas [Wed, 6 Dec 2017 00:20:43 +0000 (16:20 -0800)]
Move SettingsLib tests and EasterEgg to aapt2.
Test: make -j SettingsLibTests
Change-Id: I38fbd6af7eb5707d76fb930b4d685e30b26f45de
Merged-In: I38fbd6af7eb5707d76fb930b4d685e30b26f45de
(cherry picked from commit
41df109aca81726554d2aedf4ebea6c98f663273)
Colin Cross [Mon, 7 May 2018 17:53:09 +0000 (17:53 +0000)]
Merge changes from topic "soong_support_libs"
* changes:
convert Uibench test to aapt2
Migrate PrintSpooler to aapt2.
Migrate to AAPT2
android-build-prod (mdb) [Sat, 5 May 2018 15:50:28 +0000 (08:50 -0700)]
Merge "Convert to Soong"
am:
b466949e32
Change-Id: I3572e751c4f5da7e57fed17a39c481c51d4c758b
android-build-prod (mdb) [Sat, 5 May 2018 14:43:45 +0000 (14:43 +0000)]
Merge "Convert to Soong"
Dan Willemsen [Sat, 5 May 2018 06:17:00 +0000 (23:17 -0700)]
Convert to Soong
See build/soong/README.md for more information.
Test: cd frameworks/base/cmds/backup mma
Change-Id: I88a45ae568f80228c70f3e4a4a1facaff9520587
android-build-prod (mdb) [Sat, 5 May 2018 00:43:19 +0000 (17:43 -0700)]
Merge "AudioService: fix uid check in setBluetoothScoOn"
am:
b0ae3e5bfc
Change-Id: I23881555ddb5ce6ade6b868c0ebd7f5fc7f61169
android-build-prod (mdb) [Fri, 4 May 2018 23:19:19 +0000 (23:19 +0000)]
Merge "AudioService: fix uid check in setBluetoothScoOn"
Andreas Gampe [Fri, 4 May 2018 23:05:25 +0000 (16:05 -0700)]
Merge "Framework: Remove ART tombstoned config"
am:
95c5e5c1fd
Change-Id: I354faa8fba62ccbf387a45e993dd482293a9933e
Andreas Gampe [Fri, 4 May 2018 22:02:14 +0000 (22:02 +0000)]
Merge "Framework: Remove ART tombstoned config"
Jack Yu [Fri, 4 May 2018 18:37:39 +0000 (11:37 -0700)]
Merge "Enabled area info update for India"
am:
72cf718d20
Change-Id: Iebf82433948808948cc11f74104f5a3aee340475
Jack Yu [Fri, 4 May 2018 16:52:01 +0000 (16:52 +0000)]
Merge "Enabled area info update for India"
Aurimas Liutikas [Sat, 6 Jan 2018 00:27:23 +0000 (16:27 -0800)]
Migrate PrintSpooler to aapt2.
Test: make -j PrintSpooler
Change-Id: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4
Merged-In: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4
(cherry picked from commit
87f7ce4bd17b4d1cd0721b7b0d05f57ffdef8a0d)
Alan Viverette [Fri, 23 Mar 2018 18:33:43 +0000 (14:33 -0400)]
Migrate to AAPT2
Bug:
73128633
Test: make checkbuild
Change-Id: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
Merged-In: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
(cherry picked from commit
e3264ba6cf7df5b33b10dd6a15ac5010c78bac6e)
Kirill Grouchnikov [Tue, 1 Aug 2017 13:35:13 +0000 (09:35 -0400)]
convert Uibench test to aapt2
Bug: NA
Test: build
Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
Merged-In: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
(cherry picked from commit
bffef1f024fbd7fb005a73d0744d7f8ee019fd27)
android-build-prod (mdb) [Thu, 3 May 2018 22:07:44 +0000 (15:07 -0700)]
Merge "Fix spelling errors in BluetoothGatt documentation"
am:
e7b05b8797
Change-Id: Iec4514c414dbaf7dcc3ff5a7b621ae9a4871c94c
Andreas Gampe [Thu, 3 May 2018 17:39:31 +0000 (10:39 -0700)]
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
android-build-prod (mdb) [Thu, 3 May 2018 20:47:01 +0000 (20:47 +0000)]
Merge "Fix spelling errors in BluetoothGatt documentation"
Stanley Tng [Thu, 3 May 2018 15:50:49 +0000 (08:50 -0700)]
Fix spelling errors in BluetoothGatt documentation
Correct "paramter" to "parameter". Correct "connectoin" to connection.
Bug:
79198797
Test: Compile
Change-Id: I98646eec66da2aaa6f74ae2db35ea914c6a105a1
Jack Yu [Tue, 1 May 2018 20:53:51 +0000 (13:53 -0700)]
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)
android-build-prod (mdb) [Thu, 3 May 2018 17:25:12 +0000 (10:25 -0700)]
Merge "Framework: Restrict warning message"
am:
1c4a22fb08
Change-Id: I6236d8f5a4433fa73c931679fdd2c071b726b0f1
David Brazdil [Thu, 3 May 2018 16:29:00 +0000 (09:29 -0700)]
Merge changes I4e13e5da,I68582cf0,I528a70cc
am:
01678299ce
Change-Id: I1bc454cbe71972b04c948c354ccaa7973831b5d0
android-build-prod (mdb) [Thu, 3 May 2018 15:31:18 +0000 (15:31 +0000)]
Merge "Framework: Restrict warning message"
David Brazdil [Thu, 3 May 2018 14:15:13 +0000 (14:15 +0000)]
Merge changes I4e13e5da,I68582cf0,I528a70cc
* changes:
Remove hiddenapi-blacklist.txt
Update hiddenapi-p-light-greylist.txt
Add rule to build hidden API blacklist
Erik Kline [Thu, 3 May 2018 12:05:05 +0000 (05:05 -0700)]
Merge "Add static IpClient logging"
am:
8285261133
Change-Id: Id566002382162a848de91b85559e69bc6f7ea28d
David Brazdil [Thu, 3 May 2018 09:57:45 +0000 (10:57 +0100)]
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
Erik Kline [Thu, 3 May 2018 10:44:30 +0000 (10:44 +0000)]
Merge "Add static IpClient logging"
David Brazdil [Thu, 3 May 2018 09:55:34 +0000 (10:55 +0100)]
Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I68582cf087b2e92f10b86c7c5a8bcd095e80ffab
David Brazdil [Wed, 2 May 2018 14:47:32 +0000 (15:47 +0100)]
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
Erik Kline [Tue, 1 May 2018 07:51:44 +0000 (16:51 +0900)]
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)
android-build-prod (mdb) [Wed, 2 May 2018 22:49:21 +0000 (15:49 -0700)]
Merge "don't block adb while running uninstall"
am:
17280c61d3
Change-Id: Ida023bd6f9ba2b309e9443561f9fae43afea15fb
android-build-prod (mdb) [Wed, 2 May 2018 21:27:00 +0000 (21:27 +0000)]
Merge "don't block adb while running uninstall"
Vitor Albuquerque [Wed, 7 Mar 2018 13:39:59 +0000 (10:39 -0300)]
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
wangmingming1 [Tue, 10 Apr 2018 01:35:25 +0000 (09:35 +0800)]
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>
Anton Hansson [Wed, 2 May 2018 17:17:13 +0000 (10:17 -0700)]
Merge "frameworks/base: Update a few more references to android.jar."
am:
85e68063a9
Change-Id: I6338218432a1e9d3f99b392f6736fa6452809b82
Anton Hansson [Wed, 2 May 2018 15:31:27 +0000 (15:31 +0000)]
Merge "frameworks/base: Update a few more references to android.jar."
David Brazdil [Wed, 2 May 2018 11:48:44 +0000 (04:48 -0700)]
Merge "Build same hidden API lists as in pi-dev"
am:
c859c8097b
Change-Id: Ie11ef705d2e921ddecb845023c039e68f9633ea3
David Brazdil [Wed, 2 May 2018 10:40:37 +0000 (10:40 +0000)]
Merge "Build same hidden API lists as in pi-dev"
David Brazdil [Wed, 2 May 2018 10:36:39 +0000 (03:36 -0700)]
Merge "Publish hidden API light greylist from P"
am:
0835de9e17
Change-Id: I6c3f41abba7c96ffa93a446fa80951e95586feb5
David Brazdil [Thu, 26 Apr 2018 13:05:13 +0000 (14:05 +0100)]
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
David Brazdil [Wed, 2 May 2018 08:42:49 +0000 (08:42 +0000)]
Merge "Publish hidden API light greylist from P"
android-build-prod (mdb) [Wed, 2 May 2018 02:41:39 +0000 (19:41 -0700)]
Merge changes from topic "ifaceStats"
am:
90c01b0093
Change-Id: I0b564b2d3b13c0e5d033c5cf4aaddad3a750f2c7
Chenbo Feng [Wed, 2 May 2018 02:36:30 +0000 (19:36 -0700)]
Use eBPF map data for per iface stats
am:
dcc56783f5
Change-Id: I9d6b930c8bb20f0bffd8eecee56ea7d3081b6f54
android-build-prod (mdb) [Wed, 2 May 2018 01:19:23 +0000 (01:19 +0000)]
Merge changes from topic "ifaceStats"
* changes:
Remove the unused file parsing function
Use eBPF map data for per iface stats
Chenbo Feng [Tue, 1 May 2018 20:51:13 +0000 (13:51 -0700)]
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
Chenbo Feng [Wed, 18 Apr 2018 22:44:46 +0000 (15:44 -0700)]
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
Andreas Gampe [Tue, 1 May 2018 19:10:54 +0000 (12:10 -0700)]
Framework: Restrict warning message
Only print the message of the cache wasn't pruned.
Bug:
26978865
Test: manual
Change-Id: I564ecddf6c8fafcc9699ec6bfbd622214edf79c8
Anton Hansson [Tue, 1 May 2018 17:32:50 +0000 (18:32 +0100)]
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
Chalard Jean [Tue, 1 May 2018 04:17:21 +0000 (21:17 -0700)]
Merge "Let DnsManager fill in LinkProperties for private DNSes"
am:
59e139a767
Change-Id: Icd79a15c573a3bc2f371d724081e296eca2b236f
Chalard Jean [Tue, 1 May 2018 03:07:35 +0000 (03:07 +0000)]
Merge "Let DnsManager fill in LinkProperties for private DNSes"
android-build-prod (mdb) [Tue, 1 May 2018 02:52:35 +0000 (19:52 -0700)]
Merge changes Ie4709b6e,I57980ccb
am:
9b1c3e00bf
Change-Id: I2bd54c8b2beb0299adefd0eaa1c65ee4099c5d34
android-build-prod (mdb) [Tue, 1 May 2018 01:31:31 +0000 (01:31 +0000)]
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
android-build-prod (mdb) [Mon, 30 Apr 2018 22:06:46 +0000 (15:06 -0700)]
Merge "Get/Set IO capability of Bluetooth device"
am:
d1ed784438
Change-Id: I54ae0a715b758a0b05a31e89c43207ff59c853a6
Stanley Tng [Mon, 30 Apr 2018 21:57:40 +0000 (14:57 -0700)]
Merge "Disable Hearing Aid Profile for all platforms except Pixels"
am:
3f3cf58813
Change-Id: I89ccb8308b7472e782e924140ce4eab3a09d7dc0
android-build-prod (mdb) [Mon, 30 Apr 2018 20:37:46 +0000 (20:37 +0000)]
Merge "Get/Set IO capability of Bluetooth device"
Ajay Panicker [Mon, 30 Apr 2018 19:57:27 +0000 (12:57 -0700)]
Merge "Don't set Bluetooth volume when the Bluetooth stream changes"
am:
5528d0a9a6
Change-Id: I524f5fded23bb2f7a0dc0413092d1c6297410aa5
Stanley Tng [Mon, 30 Apr 2018 19:48:36 +0000 (19:48 +0000)]
Merge "Disable Hearing Aid Profile for all platforms except Pixels"
Ajay Panicker [Mon, 30 Apr 2018 18:06:15 +0000 (18:06 +0000)]
Merge "Don't set Bluetooth volume when the Bluetooth stream changes"
Stanley Tng [Wed, 25 Apr 2018 16:13:08 +0000 (09:13 -0700)]
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)
Pulkit Bhuwalka [Wed, 28 Mar 2018 20:51:43 +0000 (13:51 -0700)]
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)
Shuo Qian [Fri, 27 Apr 2018 19:50:23 +0000 (12:50 -0700)]
Merge "Restore the OEM hook implementation and usage"
am:
093ade312d
Change-Id: I9f2f44e24c3b926609efa85cfb932d06422cc40c
Shuo Qian [Fri, 27 Apr 2018 18:39:20 +0000 (18:39 +0000)]
Merge "Restore the OEM hook implementation and usage"
Ajay Panicker [Fri, 27 Apr 2018 14:13:23 +0000 (07:13 -0700)]
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
android-build-prod (mdb) [Fri, 27 Apr 2018 07:56:10 +0000 (00:56 -0700)]
Merge "Add the list of private DNS addresses to LinkProperties"
am:
1100e84175
Change-Id: I76ec108862edfb557496ddcd8b5c73202cd674de
Jiyong Park [Wed, 25 Apr 2018 11:05:48 +0000 (20:05 +0900)]
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
android-build-prod (mdb) [Fri, 27 Apr 2018 04:53:52 +0000 (04:53 +0000)]
Merge "Add the list of private DNS addresses to LinkProperties"
Chalard Jean [Wed, 11 Apr 2018 09:58:52 +0000 (18:58 +0900)]
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
Chalard Jean [Wed, 11 Apr 2018 07:36:41 +0000 (16:36 +0900)]
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
Jiyong Park [Thu, 22 Feb 2018 07:04:02 +0000 (16:04 +0900)]
Fix link-type check warning on com.android.nfc_extras
The library has been built without SDK, and is used by an app
NfcExtrasTests that is built with SDK. Such this SDK -> non-SDK
dependency has been causing link-type check warnings, which will turn
into errors soon.
This change fixes the warning by making a stub library
com.android.nfc_extras.stubs from the runtime library and let the app to
link against the stub library. Since the stubs library does not use any
private APIs, it is built with SDK.
Bug:
69899800
Test: m -j NfcExtrasTests is successful and does not show any link-type
check warning.
Merged-In: I57980ccbc9036d7cc6df114a975a384d10a2962b
Change-Id: I57980ccbc9036d7cc6df114a975a384d10a2962b
(cherry picked from commit
ded4fd729b50d5298e77199194996d22d3b573cf)
android-build-prod (mdb) [Fri, 27 Apr 2018 02:20:21 +0000 (19:20 -0700)]
Merge "Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS"
am:
8e386b7132
Change-Id: I11062b03de5e02e87598fd5312e01e9695cecc35
Shuo Qian [Fri, 27 Apr 2018 01:27:02 +0000 (01:27 +0000)]
Restore the OEM hook implementation and usage
The current plan is to keep the OEM hook implementation in the framework
, this is for legacy device and old device upgrading (per b/
78098059).
For P launching device, the OEM hook service is removed in hal, so the
OEM hook api in framework should return something dummy, and prevent
infinite loop to get service, but these parts should be done in seperate
CLs after this restore CL is merged.
This reverts commit
f09bde2809b4eb34fb68d0935f8b963fb6a9fcde.
Bug:
34344851
Change-Id: I2aea9be9aa7cecd4f7a1f1783391f0af173bfc59
Test: pass Treehugger tests; pass cuttlefish test RilE2eTests
Merged-In: I1f2117331a7f846b192c5f956f3841d58cb8154b
android-build-prod (mdb) [Fri, 27 Apr 2018 01:10:49 +0000 (01:10 +0000)]
Merge "Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS"
Mika Raento [Thu, 26 Apr 2018 18:12:53 +0000 (11:12 -0700)]
Merge "Systrace support for NNAPI"
am:
ecb0302ae9
Change-Id: I16dbb15a6139105b7e04761cdbcffff32b8b1706
Mika Raento [Thu, 26 Apr 2018 17:01:32 +0000 (17:01 +0000)]
Merge "Systrace support for NNAPI"
David Brazdil [Thu, 26 Apr 2018 16:06:17 +0000 (17:06 +0100)]
Publish hidden API light greylist from P
This will be periodically updated from the internal tree. The file
is not being used anywhere.
Test: N/A
Change-Id: Ie0587d82afe5daf0276914f888542711d3f3baa5
David Brazdil [Thu, 26 Apr 2018 13:40:43 +0000 (06:40 -0700)]
Merge "Generate @removed DEX API signatures"
am:
eddd165c20
Change-Id: Iff6c84e82f5127ba896dd838952e86facef58fd7
David Brazdil [Thu, 26 Apr 2018 12:39:41 +0000 (12:39 +0000)]
Merge "Generate @removed DEX API signatures"
Mika Raento [Mon, 23 Apr 2018 21:08:57 +0000 (22:08 +0100)]
Systrace support for NNAPI
Change-Id: Ie73d28937eba33e2d90f1447f17fd6d8e5719a65
Bug:
78137932
Test: mm
Erik Kline [Thu, 26 Apr 2018 05:31:56 +0000 (22:31 -0700)]
Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS"
am:
ec629e2f43
Change-Id: Ieca1a7b245f08b71e56deaaea870f6dd6c6844c4
Erik Kline [Thu, 26 Apr 2018 03:04:40 +0000 (12:04 +0900)]
Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
64133961
Bug:
77140445
Bug:
78548486
Change-Id: I48c60fd6711dcf5406fba62a3f88aea12183ff87
Erik Kline [Thu, 26 Apr 2018 04:15:20 +0000 (04:15 +0000)]
Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS"
Erik Kline [Wed, 25 Apr 2018 08:27:28 +0000 (17:27 +0900)]
Fix CaptivePortalLoginActivity probes to bypass Private DNS
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual testing on captive portal networks
Bug:
64133961
Bug:
77140445
Bug:
78548486
Change-Id: Idbc4d90eeec257b36c5f374d61dea4600a0f8ebb
Shuo Qian [Wed, 25 Apr 2018 20:45:57 +0000 (13:45 -0700)]
Merge "Revert "Revert "Remove the OEM hook implementation and usage"""
am:
b686b9cf6d
Change-Id: I3a8142c55cc0e921d84d87137bb849077197b7ac
Shuo Qian [Wed, 25 Apr 2018 19:31:54 +0000 (19:31 +0000)]
Merge "Revert "Revert "Remove the OEM hook implementation and usage"""
Shuo Qian [Tue, 24 Apr 2018 19:04:19 +0000 (19:04 +0000)]
Revert "Revert "Remove the OEM hook implementation and usage""
This reverts commit
00b89515a54b7f8d635408994c6384fb80fe2127.
Change-Id: I61c5d47fabf760bfefe843fb7a31f0a481c94c50
Merged-In: Icb06aea5eb42fd156a967c4d4e39aefc51d91cf4
Jack Yu [Wed, 25 Apr 2018 00:31:23 +0000 (17:31 -0700)]
Merge "Fixed the document of getNetworkCountryIso"
am:
8252157aca
Change-Id: I6d4c5183d525a36bf1f1cee7fd034772427a3d32
Treehugger Robot [Tue, 24 Apr 2018 23:02:38 +0000 (23:02 +0000)]
Merge "Fixed the document of getNetworkCountryIso"
Tyler Gunn [Tue, 24 Apr 2018 16:52:26 +0000 (09:52 -0700)]
Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds."
am:
a355552bfe
Change-Id: Id58f0268fd6e5a3611b2dc27d456b13fb8dcee6a
Tyler Gunn [Tue, 24 Apr 2018 15:33:29 +0000 (15:33 +0000)]
Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds."
David Brazdil [Tue, 24 Apr 2018 15:27:53 +0000 (16:27 +0100)]
Generate @removed DEX API signatures
CL I8fe27e8c03334f9c90204db1e69447de65a06a38 adds support to generate
a list of all @removed DEX API signatures. Amend the public API build
rule to produce this file.
Bug:
78182899
Test: make
Change-Id: Iba8869ce6e4f401a8e420ad83ab459d25bbbaae0
Nathan Harold [Tue, 24 Apr 2018 05:11:58 +0000 (22:11 -0700)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
am:
238eaf5183
Change-Id: Id49766c04ddfe89a28c37360c35959ff2a4a329a
Treehugger Robot [Tue, 24 Apr 2018 03:56:40 +0000 (03:56 +0000)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
Andreas Gampe [Tue, 24 Apr 2018 00:24:58 +0000 (17:24 -0700)]
Merge "PackageManager: Skip dexopt on install for debuggable apps"
am:
5faf7291f0
Change-Id: I5cd62f4ac85dc16c1ff00233096b3b6ec60a3db2
Treehugger Robot [Mon, 23 Apr 2018 22:35:17 +0000 (22:35 +0000)]
Merge "PackageManager: Skip dexopt on install for debuggable apps"
Anton Hansson [Mon, 23 Apr 2018 22:21:58 +0000 (15:21 -0700)]
Merge "Move frameworks/base off the SRC_API_DIR variable."
am:
2a4277fb00
Change-Id: I7912e0aec15b478cff139c8312893d418c360ef2
Hansong Zhang [Mon, 23 Apr 2018 21:25:27 +0000 (14:25 -0700)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF"
am:
361ab2c581
Change-Id: I38d9e8258a0ebab18c1e8565f5b4a0a12baa3deb