OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Check for IControllOffload.getServer() returning null"
Erik Kline [Tue, 12 Sep 2017 06:19:16 +0000 (06:19 +0000)]
Merge "Check for IControllOffload.getServer() returning null"
am: c5932ab2a8

Change-Id: If27fca9aa594af2f58a470709d78f19f31bb316d

6 years agoMerge "Check for IControllOffload.getServer() returning null"
Treehugger Robot [Tue, 12 Sep 2017 06:10:45 +0000 (06:10 +0000)]
Merge "Check for IControllOffload.getServer() returning null"

6 years agoCheck for IControllOffload.getServer() returning null
Erik Kline [Mon, 11 Sep 2017 07:33:27 +0000 (16:33 +0900)]
Check for IControllOffload.getServer() returning null

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 65529504

Merged-In: I5a57a9fd14dc53eaf1722fbc9a972f4f73280497
Merged-In: Ib2d1862367145260ac83f14d181646eb827538f8
Change-Id: I671487344000f1f2db92b8e4a693c096b680830c
(cherry picked from commit 87b3bfd5f2d3d0ccfc3ee1279b496d4ff289e38f)

6 years agoMerge "Show 3G data icon for TD-SCDMA network type"
Jordan Liu [Mon, 11 Sep 2017 23:06:22 +0000 (23:06 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"
am: 9da895b5e1

Change-Id: Idb27d11834099a13bc86619b8c3ea089fb863970

6 years agoMerge "Show 3G data icon for TD-SCDMA network type"
Jordan Liu [Mon, 11 Sep 2017 22:52:20 +0000 (22:52 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"

6 years agoMerge "AAPT2: Fix processing of quotes in XML"
Adam Lesinski [Mon, 11 Sep 2017 21:50:55 +0000 (21:50 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"
am: 9b65f03abf

Change-Id: I41709d30869830436aa833c3ab6aebe88a8caeed

6 years agoMerge "Revert "OMS: fix listener callbacks triggered by changes to target package""
Adam Lesinski [Mon, 11 Sep 2017 21:41:27 +0000 (21:41 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""
am: 8303fb42e0

Change-Id: I0d241d8d861b75c6c9350f4cf3183e82fe868309

6 years agoMerge "AAPT2: Fix processing of quotes in XML"
Treehugger Robot [Mon, 11 Sep 2017 21:34:53 +0000 (21:34 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"

6 years agoMerge "Revert "OMS: fix listener callbacks triggered by changes to target package""
Treehugger Robot [Mon, 11 Sep 2017 21:10:12 +0000 (21:10 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""

6 years agoShow 3G data icon for TD-SCDMA network type
Wileen Chiu [Fri, 18 Sep 2015 22:17:54 +0000 (15:17 -0700)]
Show 3G data icon for TD-SCDMA network type

- The data annunciator on the UI shows up as
"G" instead of "3G"
- Map the 3G telephony icon to network type
TD-SCDMA

Bug: 36802489
Test: manual
Change-Id: I63a0e54aab7fda2bcc6f098bb0b43799aad2f6c2

6 years agoMerge "Add ims registration status"
Ping Sun [Mon, 11 Sep 2017 20:11:37 +0000 (20:11 +0000)]
Merge "Add ims registration status"
am: d217a0c5a7  -s ours

Change-Id: I79d8729bd09208fe0c1088ad1efbf491d180c2f6

6 years agoAAPT2: Fix processing of quotes in XML
Adam Lesinski [Fri, 30 Jun 2017 00:53:36 +0000 (17:53 -0700)]
AAPT2: Fix processing of quotes in XML

When processing attributes in XML, quotes can't be used to mark a
section as whitespace preserving, so the assumption should be that the
entire string is whitespace preserving, which makes quote characters
literals.

Bug: 62840718
Bug: 62840406
Test: make aapt2_tests
Change-Id: I4afff02148b5b8e78833abf1f323c2f5325d6155

6 years agoMerge "Add ims registration status"
Treehugger Robot [Mon, 11 Sep 2017 19:44:31 +0000 (19:44 +0000)]
Merge "Add ims registration status"

6 years agoMerge "Add ims registration status" into stage-aosp-master
Brad Ebinger [Mon, 11 Sep 2017 19:42:43 +0000 (19:42 +0000)]
Merge "Add ims registration status" into stage-aosp-master

6 years agoRevert "OMS: fix listener callbacks triggered by changes to target package"
Adam Lesinski [Mon, 11 Sep 2017 19:05:04 +0000 (19:05 +0000)]
Revert "OMS: fix listener callbacks triggered by changes to target package"

Some internal tests broke due to this. Revert for now to unblock, and investigate why this occurred.

This reverts commit f08ad98acbb83abf7d30b6583bdfc188145a4215.

Bug: 65319218
Change-Id: I1bfb2d4937708441eac2ee5909717abec10f4971

6 years agoMerge "Un-hide TelephonyManager.getSignalStrength()"
nharold [Mon, 11 Sep 2017 18:07:07 +0000 (18:07 +0000)]
Merge "Un-hide TelephonyManager.getSignalStrength()"
am: 3e884ce13c

Change-Id: I0692185c533ca4a0999cbf3237c3afabd4b87972

6 years agoMerge "Un-hide TelephonyManager.getSignalStrength()"
nharold [Mon, 11 Sep 2017 17:44:34 +0000 (17:44 +0000)]
Merge "Un-hide TelephonyManager.getSignalStrength()"

6 years agoMerge "Remove config_tether_apndata for Telstra."
Amit Mahajan [Mon, 11 Sep 2017 17:31:06 +0000 (17:31 +0000)]
Merge "Remove config_tether_apndata for Telstra."
am: 777d0cd7c3

Change-Id: Iafa5e25bd94db3ce16a043a4a801ce82c97f9e13

6 years agoMerge "Remove config_tether_apndata for Telstra."
Treehugger Robot [Mon, 11 Sep 2017 17:19:35 +0000 (17:19 +0000)]
Merge "Remove config_tether_apndata for Telstra."

6 years agoRemove config_tether_apndata for Telstra.
Amit Mahajan [Thu, 31 Aug 2017 20:49:28 +0000 (13:49 -0700)]
Remove config_tether_apndata for Telstra.

Test: manual
Bug: 63564491
Change-Id: Iaca29bfd474b7df6489b1daeaeea182ebf8d81ae

6 years agoMerge "Deprecate TelephonyManager APIs which are present in TelecomManager."
Sanket Padawe [Mon, 11 Sep 2017 03:40:47 +0000 (03:40 +0000)]
Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."
am: a90205492f

Change-Id: I1d15e13cb3ae8fa8caf098e34587e3599b5bc967

6 years agoMerge "Deprecate TelephonyManager APIs which are present in TelecomManager."
Sanket Padawe [Mon, 11 Sep 2017 03:31:18 +0000 (03:31 +0000)]
Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."

6 years agoMerge "tests: remove LOCAL_CLANG"
Lennart Wieboldt [Sun, 10 Sep 2017 17:42:08 +0000 (17:42 +0000)]
Merge "tests: remove LOCAL_CLANG"
am: e77be9c610

Change-Id: Ie2b3d0c5a6c0f30e8fd768720fb6a9e4ca45e207

6 years agoMerge "tests: remove LOCAL_CLANG"
Treehugger Robot [Sun, 10 Sep 2017 17:31:20 +0000 (17:31 +0000)]
Merge "tests: remove LOCAL_CLANG"

6 years agotests: remove LOCAL_CLANG
Lennart Wieboldt [Mon, 24 Jul 2017 22:20:24 +0000 (00:20 +0200)]
tests: remove LOCAL_CLANG

clang is the default compiler since Android nougat

Test: mma & verified it´s still build with clang
Change-Id: I9bfe0668eddf51dd56174fefc650a11002d38196
Signed-off-by: Lennart Wieboldt <lennart.1997@gmx.de>
6 years agoMerge changes I93cf24d4,I32e438ef
Dan Willemsen [Sun, 10 Sep 2017 01:44:06 +0000 (01:44 +0000)]
Merge changes I93cf24d4,I32e438ef
am: 30798ad13a

Change-Id: I0b178c8523d0c5829d731f6ed05cfa3fe89ad9b4

6 years agoRename aapt_defaults to aapt2_defaults
Dan Willemsen [Sun, 10 Sep 2017 01:42:39 +0000 (01:42 +0000)]
Rename aapt_defaults to aapt2_defaults
am: 1cb5ab2dc1  -s ours

Change-Id: I057a428765b57394471f8d1f7488231109d8f274

6 years agoMerge changes I93cf24d4,I32e438ef
Treehugger Robot [Sun, 10 Sep 2017 01:29:21 +0000 (01:29 +0000)]
Merge changes I93cf24d4,I32e438ef

* changes:
  Convert host tools to Android.bp
  Rename aapt_defaults to aapt2_defaults

6 years agoMerge "Convert libhidcommand_jni to Android.bp"
Dan Willemsen [Sun, 10 Sep 2017 01:27:49 +0000 (01:27 +0000)]
Merge "Convert libhidcommand_jni to Android.bp"
am: 5a1e85eb71  -s ours

Change-Id: Ida8cfe3dd910c481f47f783ed80eb8d396b29a18

6 years agoMerge "Convert libhidcommand_jni to Android.bp"
Treehugger Robot [Sun, 10 Sep 2017 01:18:28 +0000 (01:18 +0000)]
Merge "Convert libhidcommand_jni to Android.bp"

6 years agoMerge "Convert incident_report and incident-section-gen to Android.bp"
Dan Willemsen [Sat, 9 Sep 2017 22:11:38 +0000 (22:11 +0000)]
Merge "Convert incident_report and incident-section-gen to Android.bp"
am: d928842ab6

Change-Id: I0e0ff3d75ce5f9dc302052c1da057db8d5d35cd7

6 years agoMerge "Convert incident_report and incident-section-gen to Android.bp"
Treehugger Robot [Sat, 9 Sep 2017 22:00:33 +0000 (22:00 +0000)]
Merge "Convert incident_report and incident-section-gen to Android.bp"

6 years agoMerge changes Ia3bcece1,Icd26dc1e
Dan Willemsen [Sat, 9 Sep 2017 19:28:33 +0000 (19:28 +0000)]
Merge changes Ia3bcece1,Icd26dc1e
am: ec462238f6

Change-Id: Ied36c517ed7fa80dc85b07b1532821dc93628d40

6 years agoConvert incident_report and incident-section-gen to Android.bp
Dan Willemsen [Sat, 9 Sep 2017 06:24:49 +0000 (23:24 -0700)]
Convert incident_report and incident-section-gen to Android.bp

See build/soong/README.md for more information.

Test: m incident_report incident-section-gen
Test: mmma frameworks/base
Change-Id: If1a930b40196139d29e63f6558bc4a75faca1967
Merged-In: If1a930b40196139d29e63f6558bc4a75faca1967

6 years agoConvert libhidcommand_jni to Android.bp
Dan Willemsen [Sat, 9 Sep 2017 06:23:59 +0000 (23:23 -0700)]
Convert libhidcommand_jni to Android.bp

See build/soong/README.md for more information.

Test: m libhidcommand_jni
Change-Id: Ica144979a2f89e0a9ed8eb4a816024aa318043e6
Merged-In: Ica144979a2f89e0a9ed8eb4a816024aa318043e6

6 years agoMerge changes Ia3bcece1,Icd26dc1e
Dan Willemsen [Sat, 9 Sep 2017 19:21:16 +0000 (19:21 +0000)]
Merge changes Ia3bcece1,Icd26dc1e

* changes:
  Don't compile libaapt with the build number
  aapt: Always use our libz

6 years agoMerge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master
Dan Willemsen [Sat, 9 Sep 2017 19:16:34 +0000 (19:16 +0000)]
Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master

6 years agoConvert libhidcommand_jni to Android.bp
Dan Willemsen [Sat, 9 Sep 2017 06:23:59 +0000 (23:23 -0700)]
Convert libhidcommand_jni to Android.bp

See build/soong/README.md for more information.

Test: m libhidcommand_jni
Change-Id: Ica144979a2f89e0a9ed8eb4a816024aa318043e6

6 years agoConvert host tools to Android.bp
Dan Willemsen [Sat, 9 Sep 2017 05:47:47 +0000 (22:47 -0700)]
Convert host tools to Android.bp

See build/soong/README.md for more information.

Test: m libinstrumentation interrupter accessorychat accessorytest bit obbtool pbkdf2gen libsplit-select_tests split-select protoc-gen-javastream validatekeymaps libaapt_tests aapt
Test: mmma frameworks/base
Test: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests
Test: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests
Change-Id: I93cf24d4b232353a52d53be8ed85781b8f4a3877

6 years agoRename aapt_defaults to aapt2_defaults
Dan Willemsen [Sat, 9 Sep 2017 05:44:51 +0000 (22:44 -0700)]
Rename aapt_defaults to aapt2_defaults

So that tools/aapt/Android.bp can have aapt_defaults.

Test: m aapt2
Change-Id: I32e438efb3516d73b347e67297aa09bee91520b1
Merged-In: I32e438efb3516d73b347e67297aa09bee91520b1

6 years agoRename aapt_defaults to aapt2_defaults
Dan Willemsen [Sat, 9 Sep 2017 05:44:51 +0000 (22:44 -0700)]
Rename aapt_defaults to aapt2_defaults

So that tools/aapt/Android.bp can have aapt_defaults.

Test: m aapt2
Change-Id: I32e438efb3516d73b347e67297aa09bee91520b1

6 years agoDon't compile libaapt with the build number
Dan Willemsen [Sat, 9 Sep 2017 05:02:41 +0000 (22:02 -0700)]
Don't compile libaapt with the build number

Only do that for the aapt binary itself. This will allow libaapt to be
converted to Soong.

Also remove a few lines that weren't doing anything: aaptCppflags was
never set, LOCAL_C_INCLUDES := $(LOCAL_PATH) is implied.

Test: m aapt
Test: aapt version
Change-Id: Ia3bcece14921417e1bfd3406630961c013bd497c

6 years agoaapt: Always use our libz
Dan Willemsen [Sat, 9 Sep 2017 04:26:31 +0000 (21:26 -0700)]
aapt: Always use our libz

Instead of using the system libz (-lz), include our copy as a static
library. This is safer in case the system version isn't compatible.

Also removes references to -ldl -lrt -lpthread, which are now implied.

Test: m -j
Test: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests
Test: out/host/linux-x86/nativetest64/aapt2_tests/aapt2_tests
Test: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests
Change-Id: Icd26dc1e0d011e5b5f158e562640533c5ac34e33

6 years agoMerge "Update ScanSettings documentation for scan modes"
Vinay Kalia [Fri, 8 Sep 2017 19:58:33 +0000 (19:58 +0000)]
Merge "Update ScanSettings documentation for scan modes"
am: 8157ab2a0e

Change-Id: I15a77489072925f6e99e9a0a658910616164aef3

6 years agoMerge "Update ScanSettings documentation for scan modes"
Vinay Kalia [Fri, 8 Sep 2017 19:50:36 +0000 (19:50 +0000)]
Merge "Update ScanSettings documentation for scan modes"

6 years agoMerge "CachedBluetoothDevice: Simplify ProfleConnectionState check"
xutianguo [Fri, 8 Sep 2017 19:35:27 +0000 (19:35 +0000)]
Merge "CachedBluetoothDevice: Simplify ProfleConnectionState check"
am: 4e1034cc53

Change-Id: I478f83fae3eed14e4f67bf79825a513143af4fb3

6 years agoMerge "CachedBluetoothDevice: Simplify ProfleConnectionState check"
Treehugger Robot [Fri, 8 Sep 2017 19:26:37 +0000 (19:26 +0000)]
Merge "CachedBluetoothDevice: Simplify ProfleConnectionState check"

6 years agoMerge "support chinese character for ota package's path"
Elliott Hughes [Fri, 8 Sep 2017 18:18:16 +0000 (18:18 +0000)]
Merge "support chinese character for ota package's path"
am: b8877a981a

Change-Id: I49188d97d04c69ac225422279d393b53c4966984

6 years agoMerge "support chinese character for ota package's path"
Elliott Hughes [Fri, 8 Sep 2017 18:07:01 +0000 (18:07 +0000)]
Merge "support chinese character for ota package's path"

6 years agoMerge "Avoid race condition during grayscale animation of QS tile"
Kensuke Matsui [Fri, 8 Sep 2017 14:53:38 +0000 (14:53 +0000)]
Merge "Avoid race condition during grayscale animation of QS tile"
am: bceee1cbb4

Change-Id: I9a2cddd23d79c1cdd1cee75769f8589be1c9492d

6 years agoMerge "Avoid race condition during grayscale animation of QS tile"
Treehugger Robot [Fri, 8 Sep 2017 14:38:31 +0000 (14:38 +0000)]
Merge "Avoid race condition during grayscale animation of QS tile"

6 years agoDeprecate TelephonyManager APIs which are present in TelecomManager.
Sanket Padawe [Fri, 1 Sep 2017 10:31:20 +0000 (03:31 -0700)]
Deprecate TelephonyManager APIs which are present in TelecomManager.

Bug: 62346128
Test: Build
Change-Id: I4c3b4652f5d22215572d64b764bcd42bb7295ebe
Merged-in: I4c3b4652f5d22215572d64b764bcd42bb7295ebe

6 years agoMerge "Shorten the log in the netpolicy dump."
Sudheer Shanka [Fri, 8 Sep 2017 08:47:17 +0000 (08:47 +0000)]
Merge "Shorten the log in the netpolicy dump."
am: 8c3e12a904

Change-Id: I41e80dec4d20c83e51ca212adcacdbab81d309e1

6 years agoMerge "Shorten the log in the netpolicy dump."
Treehugger Robot [Fri, 8 Sep 2017 08:33:58 +0000 (08:33 +0000)]
Merge "Shorten the log in the netpolicy dump."

6 years agoMerge "NetworkStats: more robust subtraction for deltas"
Hugo Benichi [Fri, 8 Sep 2017 07:29:15 +0000 (07:29 +0000)]
Merge "NetworkStats: more robust subtraction for deltas"
am: be1e405cc7  -s ours

Change-Id: Ibdb6876083588ad5c741fe8d45d46d119fd713fd

6 years agoShorten the log in the netpolicy dump.
Sudheer Shanka [Tue, 20 Jun 2017 02:05:31 +0000 (19:05 -0700)]
Shorten the log in the netpolicy dump.

Bug: 65439160
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Merged-In: I105326e733f2498e68b0552b45fec1ed0e8e3179

(cherry picked from commit db9aaf0322044786a27d85aeb97c39b768f89a49)

Change-Id: Ia1fa5476db4eee4cf39e438ec6aa456c60332c5c

6 years agoMerge "NetworkStats: more robust subtraction for deltas"
Hugo Benichi [Fri, 8 Sep 2017 07:13:37 +0000 (07:13 +0000)]
Merge "NetworkStats: more robust subtraction for deltas"

6 years agoCachedBluetoothDevice: Simplify ProfleConnectionState check
xutianguo [Wed, 22 Jun 2016 03:32:00 +0000 (11:32 +0800)]
CachedBluetoothDevice: Simplify ProfleConnectionState check

Check whether ProfileConnectionState is empty instead of checking
whether it is null.

BUG: N/A

Change-Id: I553e7b8b0c1b3ae967dcc0ecd482b7ff19f3c1f6
Signed-off-by: xutianguo <xutianguo@xiaomi.com>
6 years agoNetworkStats: more robust subtraction for deltas
Hugo Benichi [Mon, 7 Aug 2017 06:47:35 +0000 (15:47 +0900)]
NetworkStats: more robust subtraction for deltas

This patch ensures that subtract() between two NetworkStats object will
return a delta with no negative entries in all cases.

When the stats delta contains some negative values, there are clamped to
0. Some logging is added when this happens.

This is what's expected by NetworkStatsHistory#recordData().

Bug: 64365917
Bug: 65439160
Test: runtest frameworks-net
Merged-In: I16e97e73f600225f80e0ce517e80c07c6f399196
Merged-In: I2ac0bc3914cb65ae8ee27921856d698dc59624b2
Merged-In: I67d5dc4b52b254748ff17fe1e16c2eeb1d03c30d
Merged-In: Ib488fb034f72c92f19916490981342a3ef2eb33b

(cherry picked from commit ad5e2827ead7fa8ebafc291ceb6b4672e70c1775)

Change-Id: Ic86b65a65a2517c871221f8784088ec1de18f534

6 years agoMerge "Support NAT keepalives"
Erik Kline [Fri, 8 Sep 2017 04:27:34 +0000 (04:27 +0000)]
Merge "Support NAT keepalives"
am: 6c7c55206d

Change-Id: Id241560fa48636f1bc56fa06d2151f1bcbdb19ab

6 years agoMerge "Support NAT keepalives"
Treehugger Robot [Fri, 8 Sep 2017 04:13:14 +0000 (04:13 +0000)]
Merge "Support NAT keepalives"

6 years agoSupport NAT keepalives
Erik Kline [Mon, 19 Jun 2017 02:33:59 +0000 (11:33 +0900)]
Support NAT keepalives

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - turned on debugging and walked around watching IpReachabilityMonitor
      force neighbors into NUD_PROBE state without error
    - observed NAT callbacks happening without any reported errors
    - watched:
        adb shell cat /proc/net/nf_conntrack | egrep '192[.]168[.]43[.]' | sort -n -k5
      for correct timeout updates

Bug: 29337859
Bug: 32163131

Merged-In: I82ac60e5ad79ec64a13df6ec56b5b51b223f8dde
Merged-In: I09bc685e821ec5e871576a54c4290edea4c5160b
Merged-In: I4d180369a8f64ee494b016656988252d98a09ba4
Change-Id: Icb23da64cfaa3a19f7bc75fba426a52b0994fb0f
(cherry picked from commit 7a65bc62fbe0391f88834ab27b32033d6b957c8b)

6 years agoMerge changes Ic92b6d5c,I98b23b22,I0fb40d7b
Hugo Benichi [Fri, 8 Sep 2017 01:42:28 +0000 (01:42 +0000)]
Merge changes Ic92b6d5c,I98b23b22,I0fb40d7b
am: 9c57accc45

Change-Id: Id1a9f8232ef3e08cf708d2406403fce3c59be9e5

6 years agoMerge changes Ic92b6d5c,I98b23b22,I0fb40d7b
Hugo Benichi [Fri, 8 Sep 2017 01:25:30 +0000 (01:25 +0000)]
Merge changes Ic92b6d5c,I98b23b22,I0fb40d7b

* changes:
  IP metrics: update link layer mapping
  IP connectivity metrics: fix tests after proto update
  Connectivity metrics: update ipconnectivity.proto

6 years agoMerge "Fix Crash CarrierDefaultApp due to exception"
Chen Xu [Thu, 7 Sep 2017 21:09:54 +0000 (21:09 +0000)]
Merge "Fix Crash CarrierDefaultApp due to exception"
am: 0ec2348b85

Change-Id: I04f22351f158fb6db7ba62f680b8730fd8324f1f

6 years agoAdd ims registration status
Ping Sun [Wed, 2 Mar 2016 11:09:27 +0000 (19:09 +0800)]
Add ims registration status

Changes the below to display the "IMS registration status" menu
in Status Info setting.
1. Add a new API "isImsRegistered(int subId)" so that IMS registration
status for specific subscription is acquired.
2. Add a carrier config for the customization.

Test: manual Checked "IMS registration state" in Status Info setting
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9

6 years agoMerge "fix cellular captive portal reevaluation url"
Chen Xu [Thu, 7 Sep 2017 21:00:50 +0000 (21:00 +0000)]
Merge "fix cellular captive portal reevaluation url"
am: 88307143e0

Change-Id: I22c921fde0abb5993d1ddb3bb3660b07a72326d3

6 years agoAdd ims registration status
Ping Sun [Wed, 2 Mar 2016 11:09:27 +0000 (19:09 +0800)]
Add ims registration status

Changes the below to display the "IMS registration status" menu
in Status Info setting.
1. Add a new API "isImsRegistered(int subId)" so that IMS registration
status for specific subscription is acquired.
2. Add a carrier config for the customization.

Test: manual Checked "IMS registration state" in Status Info setting
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9

6 years agoMerge "Fix Crash CarrierDefaultApp due to exception"
Chen Xu [Thu, 7 Sep 2017 20:59:03 +0000 (20:59 +0000)]
Merge "Fix Crash CarrierDefaultApp due to exception"

6 years agoMerge "fix cellular captive portal reevaluation url"
Chen Xu [Thu, 7 Sep 2017 20:46:50 +0000 (20:46 +0000)]
Merge "fix cellular captive portal reevaluation url"

6 years agofix cellular captive portal reevaluation url
fionaxu [Mon, 10 Jul 2017 16:34:07 +0000 (09:34 -0700)]
fix cellular captive portal reevaluation url

we apply redirection link as the url everywhere for cellular captive portal.
this url should only be used when load the portal page at the first place (when users
click on the notification) and shouldn't be used as the re-evaluation url
as it wont return the expected response code.
instead we should use special URL (generate_204) from connectivity
service which will return 204 if redirection is gone.

Test: manual test with cold and hot TMO SIM
Bug: 62532802
Change-Id: I56bb03a58447c5c46758e692ff357d540ea4cd7b

6 years agoIP metrics: update link layer mapping
Hugo Benichi [Tue, 18 Jul 2017 02:35:18 +0000 (11:35 +0900)]
IP metrics: update link layer mapping

Properly map transport nan and lowpan to their corresponding link layer
enum. Also do so for interface names

Bug: 34901696
Bug: 65439160
Test: runtest frameworks-net
Merged-In: I44a1cb3b6d21881b64adda7744360e4dfc519b12

(cherry picked from commit f7f7ed013ca7641c784b81ef685bd84c4c45cfbb)

Change-Id: Ic92b6d5c07404ea79f9a8975e8fc6925eaa10ba4

6 years agoIP connectivity metrics: fix tests after proto update
Hugo Benichi [Tue, 18 Jul 2017 05:28:27 +0000 (14:28 +0900)]
IP connectivity metrics: fix tests after proto update

Update to ipconnectivity.proto in commit
6d2f506bfd788a3685292d404dc9d82a27357cfe broke the associated unit
tests (Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9)

Bug: 34901696
Bug: 65439160
Test: runtest frameworks-net
Merged-In: I57a6bad8a9836b1c45690c4589b416786ce1dfa0

(cherry picked from commit 822c5bf77892175d0b52aeaddf4e43c749c341f6)

Change-Id: I98b23b2208bbd7d12237fcb000f3cf10c53d9e55

6 years agoConnectivity metrics: update ipconnectivity.proto
Hugo Benichi [Tue, 20 Jun 2017 02:15:14 +0000 (11:15 +0900)]
Connectivity metrics: update ipconnectivity.proto

Bug: 34901696
Bug: 65439160
Test: $runtest frameworks-net
      build, flashed, booted phone, $ adb shell dumpsys connmetrics list

Merged-In: I4cf5b95956df721aecd63fddfb026a7266c190b9

(cherry picked from commit 6d2f506bfd788a3685292d404dc9d82a27357cfe)

Change-Id: I0fb40d7b644786efc839468b2d7e1cfcedd71ad8

6 years agoMerge "Always add local subnet routes to the interface's routing table"
Rubin Xu [Thu, 7 Sep 2017 12:25:05 +0000 (12:25 +0000)]
Merge "Always add local subnet routes to the interface's routing table"
am: 981228be38

Change-Id: I0b1728fae18c891d91fafdfbb1905c05e0fea47f

6 years agoMerge "Always add local subnet routes to the interface's routing table"
Rubin Xu [Thu, 7 Sep 2017 12:12:09 +0000 (12:12 +0000)]
Merge "Always add local subnet routes to the interface's routing table"

6 years agoAvoid race condition during grayscale animation of QS tile
Kensuke Matsui [Wed, 5 Jul 2017 05:53:05 +0000 (14:53 +0900)]
Avoid race condition during grayscale animation of QS tile

DrawableIcon returns the same instance of its Drawable
for both getDrawable() and getInvisibleDrawable().
This could cause a race condition during grayscale animation
of a QS tile which uses the same icon for both ON and OFF state.

Clone the original Drawable and use it for invisible drawable
to solve this.

Fixes: 65437135
Test: manual - put a custom tile at the first position of QS panel
               and tap it

Change-Id: Ie74edd9c5e58118a70b5abd8096cdd1297940ef5

6 years agoAlways add local subnet routes to the interface's routing table
Rubin Xu [Tue, 5 Sep 2017 17:40:49 +0000 (18:40 +0100)]
Always add local subnet routes to the interface's routing table

For some networks such as mobile data connections, its LinkProperties
does not contain routes for the local subnet so no such route is added
to the interface's routing table. This can be problematic especially
if the device is in VPN lockdown mode where there exists high-priority
PROHIBIT routing rule which in turn blocks the network's default gateway
route from being added (next hop address hitting the prohibit rule).

We fix this by patching LinkProperties to always include direct connected routes
when they are received by ConnectivityService. This has the added advantage that
when apps get LinkProperties, they see the directly connected routes as well.

Bug: 63662962
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: Start with device with mobile data, set up ics-OpenVPN in always-on
      lockdown mode. Turn off mobile data then turn it back on, observe
      mobile data connectivity is restored and VPN successfully reconnects.
Change-Id: I35b614eebccfd22c4a5270f40256f9be1e25abfb

6 years agoresolve merge conflicts of 6c7ef2e8d753 to stage-aosp-master
fionaxu [Thu, 7 Sep 2017 05:57:32 +0000 (22:57 -0700)]
resolve merge conflicts of 6c7ef2e8d753 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Change-Id: I6a3488f21412b17e9a6bb453bd4137abab3ae205

6 years agoFix Crash CarrierDefaultApp due to exception
Qiongcheng Luo [Fri, 4 Aug 2017 06:34:34 +0000 (14:34 +0800)]
Fix Crash CarrierDefaultApp due to exception

[Issue]
CarrierDefaultApp crashes due to null pointer exception.

[Cause of defect]
To call mUrl.toString() even if mUrl is null and mUrl is already
checked if it is null just before.

[How to fix]
Check the null status of mUrl when call its toString() method.

Bug: 65393337

Change-Id: I4b4b1f125aac7e30ca18be22d7adc358cab83b2f

6 years agoMerge "disable carrier actions on redirection by default"
Treehugger Robot [Wed, 6 Sep 2017 23:53:48 +0000 (23:53 +0000)]
Merge "disable carrier actions on redirection by default"

6 years agodisable carrier actions on redirection by default
fionaxu [Wed, 6 Sep 2017 21:19:16 +0000 (14:19 -0700)]
disable carrier actions on redirection by default

    1. the assumption of "carrier will redirect users to their captive
    portal page when users dont have data plan" might not be true for all
    carriers. We have seem issues like carriers random redirect users when
    they still have balance left.
    2. turn this off by default and turn it on if the carrier is
    behaving correctly and agree with it.

Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Bug: 65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3

6 years agoMerge "idmap: include idmap version in check for stale file"
Adam Lesinski [Wed, 6 Sep 2017 20:36:28 +0000 (20:36 +0000)]
Merge "idmap: include idmap version in check for stale file"
am: 609887a980

Change-Id: I4779cd92041fe33a95c0034c539c48989ca8e6df

6 years agoMerge "idmap: suppress print for padded resources"
Mårten Kongstad [Wed, 6 Sep 2017 20:04:35 +0000 (20:04 +0000)]
Merge "idmap: suppress print for padded resources"
am: 3949701c6f

Change-Id: I5d92bdc11172159ea8ad95614e2b4d4535a48e45

6 years agoMerge "idmap: include idmap version in check for stale file"
Adam Lesinski [Wed, 6 Sep 2017 19:44:26 +0000 (19:44 +0000)]
Merge "idmap: include idmap version in check for stale file"

6 years agoMerge "idmap: suppress print for padded resources"
Treehugger Robot [Wed, 6 Sep 2017 19:41:01 +0000 (19:41 +0000)]
Merge "idmap: suppress print for padded resources"

6 years agoMerge "Fix intermittent build failures with droiddoc generated sources"
Colin Cross [Wed, 6 Sep 2017 18:47:58 +0000 (18:47 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources"
am: a11709b185

Change-Id: I7c6c2dc0fcb50387df07760e913f8f6841bc02bc

6 years agoMerge "Fix intermittent build failures with droiddoc generated sources"
Colin Cross [Wed, 6 Sep 2017 18:34:47 +0000 (18:34 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources"

6 years agoFix intermittent build failures with droiddoc generated sources
Colin Cross [Wed, 6 Sep 2017 05:59:27 +0000 (22:59 -0700)]
Fix intermittent build failures with droiddoc generated sources

Jack builds fail very rarely with missing droiddoc generated
source files.  This happens because jack builds have an extra
rule that does a quick check of the sources and touches a
jack.check.timestamp file.  The manual dependencies for the
generated sources didn't cover this case.  If the sources are
partially generated when the jack.check.timestamp rule runs,
the rule can see partial sources and fail.  The same problem
might also happen for javac builds after
https://android-review.googlesource.com/c/platform/build/+/404743
separated the source list generation rule out of the
$(full_classes_jar) rule.

Use LOCAL_ADDITIONAL_DEPENDENCIES instead, which covers these
cases and will be updated to cover future changes.

Bug: 65255877
Test: m -j ANDROID_COMPILE_WITH_JACK=true out/target/common/obj/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/jack.check.timestamp
      make sure sources are generated

Change-Id: I4466b3128eb0bba6447c24abf921a6655a3d451f
Merged-In: I4466b3128eb0bba6447c24abf921a6655a3d451f
(cherry picked from commit 85ab406eb2abd2e98fa9a67384223592692c08a9)

6 years agoMerge "Separate GraphicsEnv from libui"
Jiyong Park [Wed, 6 Sep 2017 16:03:32 +0000 (16:03 +0000)]
Merge "Separate GraphicsEnv from libui"
am: fb5369bc3f

Change-Id: I7d1fbc70ef0b4273390ce15ae0b36553ef08220d

6 years agoMerge "Separate GraphicsEnv from libui"
Treehugger Robot [Wed, 6 Sep 2017 15:53:00 +0000 (15:53 +0000)]
Merge "Separate GraphicsEnv from libui"

6 years agoMerge "Fix NPE in StatusBar#onBackPressed()"
Kensuke Matsui [Wed, 6 Sep 2017 15:17:05 +0000 (15:17 +0000)]
Merge "Fix NPE in StatusBar#onBackPressed()"
am: 6cfa7f2fee

Change-Id: Ic29857e67231ff109535adf18882b869d7ce6af1

6 years agoMerge "Fix NPE in StatusBar#onBackPressed()"
Treehugger Robot [Wed, 6 Sep 2017 15:10:18 +0000 (15:10 +0000)]
Merge "Fix NPE in StatusBar#onBackPressed()"

6 years agoFix NPE in StatusBar#onBackPressed()
Kensuke Matsui [Fri, 21 Jul 2017 08:35:10 +0000 (17:35 +0900)]
Fix NPE in StatusBar#onBackPressed()

StatusBar.mKeyguardUserSwitcher is instantiated
only if multi user function is enabled.
But mKeyguardUserSwitcher.hideIfNotSimple() is invoked
without null check in StatusBar#onBackPressed().
This causes NPE on multi user disabled devices.

Fixes: 65391930
Test: manual - tap Back key on lockscreen

Change-Id: I528823fa832ee5096d73dea660997fc276d86c5c

6 years agoMerge "Bluetooth: Thread-safe binder invocation"
Jack He [Wed, 6 Sep 2017 00:30:09 +0000 (00:30 +0000)]
Merge "Bluetooth: Thread-safe binder invocation"
am: 94f1fd0da2

Change-Id: I8f9c76996f02c70b8d2ea21d4eb567eaa9da246a

6 years agoMerge "Bluetooth: Thread-safe binder invocation"
Treehugger Robot [Wed, 6 Sep 2017 00:10:55 +0000 (00:10 +0000)]
Merge "Bluetooth: Thread-safe binder invocation"

6 years agoBluetooth: Thread-safe binder invocation
Jack He [Thu, 17 Aug 2017 19:11:18 +0000 (12:11 -0700)]
Bluetooth: Thread-safe binder invocation

* Binder object may become null between null check and actual invocation
  if using a instance private variable assignable by service connection
  callbacks
* The solution to this problem without locking is to assign existing
  binder variable to a local final variable before the null check
* Any further invocation to a disconnected binder object will result in
  RemoteException that is caught by the try-catch block
* Read and write to volatile variable is always atomic and hence thread-safe
* Removed unnecessary synchronization in BluetoothAdapter constructor
* Private mConnection objects should be final
* Simplfied several return statements where booleans can be returned
  directly
* Removed unnecessary catches for NPE since there won't be any

Bug: 64724692
Test: make, pair and use devices, no functional change
Change-Id: Ifc9d6337c0d451a01484b61243230725d5314f8e

6 years agoMerge "Update documentation for startScan"
Vinay Kalia [Wed, 6 Sep 2017 00:08:24 +0000 (00:08 +0000)]
Merge "Update documentation for startScan"
am: 7d2219d170

Change-Id: I5ea7a5a9b0a69168a1715986e4850276299af78a

6 years agoMerge "Update documentation for startScan"
Treehugger Robot [Tue, 5 Sep 2017 23:50:24 +0000 (23:50 +0000)]
Merge "Update documentation for startScan"

6 years agoSeparate GraphicsEnv from libui
Jiyong Park [Mon, 8 May 2017 04:29:35 +0000 (13:29 +0900)]
Separate GraphicsEnv from libui

GraphicsEnv class is separated from libui and became a standalone lib
'libgraphicsenv'.

Bug: 38097618
Test: sailfish builds and boots
Change-Id: I7a5c273ba9238c3a6c90e1de80b9e97fc0772188