OSDN Git Service

android-x86/frameworks-base.git
6 years agoUnhide RecoverableKeyStoreLoader API.
Dmitry Dementyev [Tue, 9 Jan 2018 02:08:23 +0000 (18:08 -0800)]
Unhide RecoverableKeyStoreLoader API.

Bug: 66499222
Test: GTS tests under development
Change-Id: I4285beaa26bc94d92f6213a34eb1e41ad0994d7a

6 years agoMerge "Deprecate location modes"
Maggie Wang [Wed, 24 Jan 2018 01:47:54 +0000 (01:47 +0000)]
Merge "Deprecate location modes"

6 years agoMerge "Prepare KeyStore RecoveryController API for review."
Dmitry Dementyev [Wed, 24 Jan 2018 01:45:08 +0000 (01:45 +0000)]
Merge "Prepare KeyStore RecoveryController API for review."

6 years agoMerge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c am: dae9a8e839
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 01:36:58 +0000 (01:36 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c am: dae9a8e839
am: c240b8c25f

Change-Id: Ie866867f99c8699703b6d12d0af78fbff5d5f59b

6 years agoMerge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 01:23:32 +0000 (01:23 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c
am: dae9a8e839

Change-Id: I593635999bdfa290b012313d9967bddfc5e7bfe1

6 years agoMerge changes from topic "signal-strength-cleanup" am: fb24180fe0 am: 2621c9f6ad
nharold [Wed, 24 Jan 2018 01:19:36 +0000 (01:19 +0000)]
Merge changes from topic "signal-strength-cleanup" am: fb24180fe0 am: 2621c9f6ad
am: d5c9522b43

Change-Id: I8c30c1401e97adcb026a25607a737bd336685807

6 years agoCleanup SignalStrength Parcel am: 9becf4b334 am: 02f4ec2eed
Nathan Harold [Wed, 24 Jan 2018 01:15:14 +0000 (01:15 +0000)]
Cleanup SignalStrength Parcel am: 9becf4b334 am: 02f4ec2eed
am: a644d93ec9

Change-Id: Id3abf1f4c2f1faaef6dd44e702590f157fcac7d2

6 years agoMerge "Add TransportType in AccessNetworkConstants.java"
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 01:12:24 +0000 (01:12 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java"
am: afd65d9d1c

Change-Id: Ie0ef55c0a3e75937a0e68b364bf6e202ad0678bd

6 years agoMerge changes from topic "signal-strength-cleanup" am: fb24180fe0
nharold [Wed, 24 Jan 2018 01:08:33 +0000 (01:08 +0000)]
Merge changes from topic "signal-strength-cleanup" am: fb24180fe0
am: 2621c9f6ad

Change-Id: I30b5deb01ed68dc0e235e9997fa147aadb924749

6 years agoCleanup SignalStrength Parcel am: 9becf4b334
Nathan Harold [Wed, 24 Jan 2018 01:05:07 +0000 (01:05 +0000)]
Cleanup SignalStrength Parcel am: 9becf4b334
am: 02f4ec2eed

Change-Id: I9e862b15ab4b5871d9d7e00af86ab9049b5b7b50

6 years agoMerge changes from topic "signal-strength-cleanup"
nharold [Wed, 24 Jan 2018 00:58:38 +0000 (00:58 +0000)]
Merge changes from topic "signal-strength-cleanup"
am: fb24180fe0

Change-Id: Iad22d4d91032a87877994bfca00c4f80d11f66c0

6 years agoCleanup SignalStrength Parcel
Nathan Harold [Wed, 24 Jan 2018 00:54:13 +0000 (00:54 +0000)]
Cleanup SignalStrength Parcel
am: 9becf4b334

Change-Id: I44e6b2187bbcb2334adb40be5d438f581d9638bb

6 years agoMerge "Revert "pm: Scan as privileged apps that share a privileged user""
Jeffrey Vander Stoep [Wed, 24 Jan 2018 00:46:27 +0000 (00:46 +0000)]
Merge "Revert "pm: Scan as privileged apps that share a privileged user""

6 years agoRevert "pm: Scan as privileged apps that share a privileged user"
Jeffrey Vander Stoep [Wed, 24 Jan 2018 00:38:55 +0000 (00:38 +0000)]
Revert "pm: Scan as privileged apps that share a privileged user"

This reverts commit 2ede04735081bd8c0e399a280484fb9e6089f33f.

This change + 77029c5b16351775cb2333369ef9a4bc1d9acf58
pass build checks/tests, (with the exception of a known unrelated test failure), but together break the build.
Change-Id: I067da56df7239539e570499347ffaf91d6af2b0d

6 years agoMerge "Show CONSTRAINT_BACKGROUND_NOT_RESTRICTED in dumpsys"
Makoto Onuki [Tue, 23 Jan 2018 23:45:50 +0000 (23:45 +0000)]
Merge "Show CONSTRAINT_BACKGROUND_NOT_RESTRICTED in dumpsys"

6 years agoShow CONSTRAINT_BACKGROUND_NOT_RESTRICTED in dumpsys
Makoto Onuki [Mon, 22 Jan 2018 23:11:34 +0000 (15:11 -0800)]
Show CONSTRAINT_BACKGROUND_NOT_RESTRICTED in dumpsys

Bug: 72331999
Test: Manual test with dumpsys
Test: atest CtsJobSchedulerTestCases
Change-Id: I3f7101f2b0b3c7ec8b1456469477bf42933569c4

6 years agoMerge "Expose permission-related Slice APIs"
Jason Monk [Tue, 23 Jan 2018 23:41:58 +0000 (23:41 +0000)]
Merge "Expose permission-related Slice APIs"

6 years agoMerge "Add TransportType in AccessNetworkConstants.java"
Xiangyu/Malcolm Chen [Tue, 23 Jan 2018 23:39:10 +0000 (23:39 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java"

6 years agoMerge "pm: Scan as privileged apps that share a privileged user"
Jeffrey Vander Stoep [Tue, 23 Jan 2018 23:34:51 +0000 (23:34 +0000)]
Merge "pm: Scan as privileged apps that share a privileged user"

6 years agoMerge changes from topic "signal-strength-cleanup"
nharold [Tue, 23 Jan 2018 23:23:48 +0000 (23:23 +0000)]
Merge changes from topic "signal-strength-cleanup"

* changes:
  Fix getAsuLevel returns "99" in Lte and TdScdma.
  Cleanup SignalStrength Parcel

6 years agoMerge "Add proof-of-rotation information to PackageParser.SigningDetails"
TreeHugger Robot [Tue, 23 Jan 2018 23:19:59 +0000 (23:19 +0000)]
Merge "Add proof-of-rotation information to PackageParser.SigningDetails"

6 years agoMerge "Add API to set divider color in code"
Jorim Jaggi [Tue, 23 Jan 2018 23:16:40 +0000 (23:16 +0000)]
Merge "Add API to set divider color in code"

6 years agoMerge "Force screenshots to heads-up priority."
TreeHugger Robot [Tue, 23 Jan 2018 23:12:56 +0000 (23:12 +0000)]
Merge "Force screenshots to heads-up priority."

6 years agoMerge "Add DPM API to block apps from using metered data."
Sudheer Shanka [Tue, 23 Jan 2018 23:02:40 +0000 (23:02 +0000)]
Merge "Add DPM API to block apps from using metered data."

6 years agoMerge "Remove old slice APIs for color"
Jason Monk [Tue, 23 Jan 2018 23:01:54 +0000 (23:01 +0000)]
Merge "Remove old slice APIs for color"

6 years agoMerge changes Id24a439e,I87e96fb4
TreeHugger Robot [Tue, 23 Jan 2018 22:48:01 +0000 (22:48 +0000)]
Merge changes Id24a439e,I87e96fb4

* changes:
  OMS: fix listener callbacks triggered by changes to target package
  OMS: fix offset-by-one error when setting overlay priority

6 years agoMerge "Expose existing SubscriptionPlan APIs."
Jeff Sharkey [Tue, 23 Jan 2018 22:39:11 +0000 (22:39 +0000)]
Merge "Expose existing SubscriptionPlan APIs."

6 years agoMerge "Enable incidentd.rc also add dump and usage_stats permission to statsd so...
Yi Jin [Tue, 23 Jan 2018 22:38:21 +0000 (22:38 +0000)]
Merge "Enable incidentd.rc also add dump and usage_stats permission to statsd so it bypass incidentd's permission check"

6 years agoMerge "Keystore APIs for Import Wrapped Key, Strongbox, 3DES"
TreeHugger Robot [Tue, 23 Jan 2018 22:28:30 +0000 (22:28 +0000)]
Merge "Keystore APIs for Import Wrapped Key, Strongbox, 3DES"

6 years agoPrepare KeyStore RecoveryController API for review.
Dmitry Dementyev [Tue, 23 Jan 2018 21:02:08 +0000 (13:02 -0800)]
Prepare KeyStore RecoveryController API for review.

- set/get recovery status simplification
- adding account to WrappedKey
- moving recovery methods to the Session class.

There are small cosmetical changes to .aidl which don't affect
implementation logic.

Bug: 72299798
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I9efaa4cde42cf778bb97ed13f62750a65d8c6cb5

6 years agoMerge "Putting ZenModePanel xml resources to SettingsLib"
Beverly Tai [Tue, 23 Jan 2018 22:20:53 +0000 (22:20 +0000)]
Merge "Putting ZenModePanel xml resources to SettingsLib"

6 years agoMerge "ScreenshotActionReceiver must be listed in manifest."
Alison Cichowlas [Tue, 23 Jan 2018 22:19:18 +0000 (22:19 +0000)]
Merge "ScreenshotActionReceiver must be listed in manifest."

6 years agoMerge "[QS] Update secondary text + label for bluetooth tile"
Rohan Shah [Tue, 23 Jan 2018 22:11:25 +0000 (22:11 +0000)]
Merge "[QS] Update secondary text + label for bluetooth tile"

6 years agoMerge "Merge "Combined flags of data service requests into one reason param" am:...
Android Build Merger (Role) [Tue, 23 Jan 2018 22:09:40 +0000 (22:09 +0000)]
Merge "Merge "Combined flags of data service requests into one reason param" am: 7d441c9b27 am: 28f64b869c am: eeac3b9d62"

6 years agoMerge "Combined flags of data service requests into one reason param" am: 7d441c9b27...
Jack Yu [Tue, 23 Jan 2018 22:09:11 +0000 (22:09 +0000)]
Merge "Combined flags of data service requests into one reason param" am: 7d441c9b27 am: 28f64b869c
am: eeac3b9d62

Change-Id: I6b33b760ff26e1aaf7fdf3929ca71c7c14d78b36

6 years agoMerge "Remove settings intent"
Julia Reynolds [Tue, 23 Jan 2018 22:08:32 +0000 (22:08 +0000)]
Merge "Remove settings intent"

6 years agoMerge "Combined flags of data service requests into one reason param" am: 7d441c9b27
Jack Yu [Tue, 23 Jan 2018 22:00:39 +0000 (22:00 +0000)]
Merge "Combined flags of data service requests into one reason param" am: 7d441c9b27
am: 28f64b869c

Change-Id: I5823943d1e3bed41f4bd26fa1d718d6a2e6acc48

6 years agoMerge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am: 572f65fb58 am:...
Robert Sesek [Tue, 23 Jan 2018 22:00:08 +0000 (22:00 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am: 572f65fb58 am: cb7119385e
am: 000552a64d

Change-Id: If279fa06502f3bd39542504352c07a4e15b078dd

6 years agoMerge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev am:...
Felipe Leme [Tue, 23 Jan 2018 21:52:45 +0000 (21:52 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev am: 2eeab61b4c
am: e14921216a  -s ours

Change-Id: I4e485a49a8944c46f3c4ce45040194b6f53195ae

6 years agoMerge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am: 572f65fb58
Robert Sesek [Tue, 23 Jan 2018 21:52:04 +0000 (21:52 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am: 572f65fb58
am: cb7119385e

Change-Id: Iaf7a31629d06d87400796899f659926e5186ac41

6 years agoMerge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
Felipe Leme [Tue, 23 Jan 2018 21:46:43 +0000 (21:46 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
am: 2eeab61b4c

Change-Id: Idda0d7fbc0f63bcbad44da6a46cef786770a2851

6 years agoMerge "Combined flags of data service requests into one reason param"
Jack Yu [Tue, 23 Jan 2018 21:46:18 +0000 (21:46 +0000)]
Merge "Combined flags of data service requests into one reason param"
am: 7d441c9b27

Change-Id: I6e8069639e5d7d57fde69747fb78d044e625680e

6 years agoMerge changes Ie3943d2b,I158f560f
Jorim Jaggi [Tue, 23 Jan 2018 21:44:24 +0000 (21:44 +0000)]
Merge changes Ie3943d2b,I158f560f

* changes:
  New task switch animation
  New activity open/close animation

6 years agoMerge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
Robert Sesek [Tue, 23 Jan 2018 21:42:19 +0000 (21:42 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
am: 572f65fb58

Change-Id: I822fdad1c22de97884e389f651230ef31cd65deb

6 years agoMerge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
TreeHugger Robot [Tue, 23 Jan 2018 21:39:09 +0000 (21:39 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev

6 years agoMerge "Hide keyguard slice when pulsing"
Lucas Dupin [Tue, 23 Jan 2018 21:23:15 +0000 (21:23 +0000)]
Merge "Hide keyguard slice when pulsing"

6 years agoMerge "Move APIs to final location in preparation for API review"
Dmitry Dementyev [Tue, 23 Jan 2018 20:57:14 +0000 (20:57 +0000)]
Merge "Move APIs to final location in preparation for API review"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 23 Jan 2018 20:47:26 +0000 (20:47 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Add checks to ensure SPIs are not reused" am: 0a1dd194aa am: 1a2e3f3b54
Benedict Wong [Tue, 23 Jan 2018 20:40:39 +0000 (20:40 +0000)]
Merge "Add checks to ensure SPIs are not reused" am: 0a1dd194aa am: 1a2e3f3b54
am: 0803f21c47

Change-Id: I13738ac37710ec7934998ef269681ae7c41c612e

6 years agoMerge "Added new slot status related broadcast." am: cdc0a084d1 am: 40effae0f3
Amit Mahajan [Tue, 23 Jan 2018 20:35:06 +0000 (20:35 +0000)]
Merge "Added new slot status related broadcast." am: cdc0a084d1 am: 40effae0f3
am: b641b585bb  -s ours

Change-Id: I989af451943a1100770a302f16772f27a2df0c4c

6 years agoMerge changes from topic "am-2e62287de9d64a8d9d3aba7f81c8e5cf"
Android Build Merger (Role) [Tue, 23 Jan 2018 20:22:10 +0000 (20:22 +0000)]
Merge changes from topic "am-2e62287de9d64a8d9d3aba7f81c8e5cf"

* changes:
  Merge changes from topic "multipath-datausage-backport" am: df984fae26 am: c46c21c702 am: ce9b009827  -s ours
  Add metered, roaming, and defaultNetwork info to NetworkTemplate. am: 0f9bce6883 am: e383807d7f am: f5c668bf38  -s ours
  Unbreak frameworks-net tests broken by missing libutilscallstack. am: f7fab104f9 am: df4aba36b4 am: 333eb0ee46  -s ours
  Disable IpConnectivityMetricsTest. am: b7a479c293 am: afb4ba1c35 am: 2d1c6405d6  -s ours
  Add the defaultNetwork element to the netstats.proto. am: 9781f785bc am: adcb94472a am: 5d50149710  -s ours
  Add getDefaultNetwork to the NetworkStats public API. am: d5876bc438 am: 66eab17abc am: 424fbdbd1e  -s ours

6 years agoMerge changes from topic "multipath-datausage-backport" am: df984fae26 am: c46c21c702
Lorenzo Colitti [Tue, 23 Jan 2018 20:20:53 +0000 (20:20 +0000)]
Merge changes from topic "multipath-datausage-backport" am: df984fae26 am: c46c21c702
am: ce9b009827  -s ours

Change-Id: Ib16c50de2a3846dae9736e7ca68a4282831f0812

6 years agoMerge "Accept null brightness configs."
TreeHugger Robot [Tue, 23 Jan 2018 20:19:16 +0000 (20:19 +0000)]
Merge "Accept null brightness configs."

6 years agoAdd metered, roaming, and defaultNetwork info to NetworkTemplate. am: 0f9bce6883...
Lorenzo Colitti [Tue, 23 Jan 2018 20:16:55 +0000 (20:16 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate. am: 0f9bce6883 am: e383807d7f
am: f5c668bf38  -s ours

Change-Id: I2710d5205e1d010f0b928acb7f76631a66d6349e

6 years agoUnbreak frameworks-net tests broken by missing libutilscallstack. am: f7fab104f9...
Lorenzo Colitti [Tue, 23 Jan 2018 20:13:23 +0000 (20:13 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack. am: f7fab104f9 am: df4aba36b4
am: 333eb0ee46  -s ours

Change-Id: I38c1db830a78e3dbde51f957919aebf44e3b874a

6 years agoScreenshotActionReceiver must be listed in manifest.
Alison Cichowlas [Tue, 23 Jan 2018 20:08:13 +0000 (15:08 -0500)]
ScreenshotActionReceiver must be listed in manifest.

Bug: 72387021
Test: Manual verification against repro in bug
Change-Id: I3e42adec06c63155e4e1bf3c9a5b5abe65fe29c6

6 years agoDisable IpConnectivityMetricsTest. am: b7a479c293 am: afb4ba1c35
Lorenzo Colitti [Tue, 23 Jan 2018 20:10:13 +0000 (20:10 +0000)]
Disable IpConnectivityMetricsTest. am: b7a479c293 am: afb4ba1c35
am: 2d1c6405d6  -s ours

Change-Id: Ie9b63bf66eee676568e7262350033dbb286c04c4

6 years agoAdd the defaultNetwork element to the netstats.proto. am: 9781f785bc am: adcb94472a
Lorenzo Colitti [Tue, 23 Jan 2018 20:06:47 +0000 (20:06 +0000)]
Add the defaultNetwork element to the netstats.proto. am: 9781f785bc am: adcb94472a
am: 5d50149710  -s ours

Change-Id: Ife16614408062fb3a4a8954008a5d1aa63986edf

6 years agoAdd getDefaultNetwork to the NetworkStats public API. am: d5876bc438 am: 66eab17abc
Lorenzo Colitti [Tue, 23 Jan 2018 20:03:40 +0000 (20:03 +0000)]
Add getDefaultNetwork to the NetworkStats public API. am: d5876bc438 am: 66eab17abc
am: 424fbdbd1e  -s ours

Change-Id: I5df239d3da75332233b5043a163938d03f889881

6 years agoMerge "Add checks to ensure SPIs are not reused" am: 0a1dd194aa
Benedict Wong [Tue, 23 Jan 2018 19:55:47 +0000 (19:55 +0000)]
Merge "Add checks to ensure SPIs are not reused" am: 0a1dd194aa
am: 1a2e3f3b54

Change-Id: I8c7243bc600e5f2e9abec03b5a357ed6376aa9bf

6 years agoMerge "Added new slot status related broadcast." am: cdc0a084d1
Amit Mahajan [Tue, 23 Jan 2018 19:50:57 +0000 (19:50 +0000)]
Merge "Added new slot status related broadcast." am: cdc0a084d1
am: 40effae0f3

Change-Id: I3a4174eff2dc8ce017aae4c2d31f2facde02dbe5

6 years agoMerge "Combined flags of data service requests into one reason param"
Treehugger Robot [Tue, 23 Jan 2018 19:43:25 +0000 (19:43 +0000)]
Merge "Combined flags of data service requests into one reason param"

6 years agoMerge changes from topic "multipath-datausage-backport" am: df984fae26
Lorenzo Colitti [Tue, 23 Jan 2018 19:43:13 +0000 (19:43 +0000)]
Merge changes from topic "multipath-datausage-backport" am: df984fae26
am: c46c21c702

Change-Id: I45f0c69e3440e9ec69c82e81c41bea682a359389

6 years agoAdd metered, roaming, and defaultNetwork info to NetworkTemplate. am: 0f9bce6883
Lorenzo Colitti [Tue, 23 Jan 2018 19:39:18 +0000 (19:39 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate. am: 0f9bce6883
am: e383807d7f

Change-Id: I1faf95edec0e836c69016c84ad2a2c8518f8eb53

6 years agoUnbreak frameworks-net tests broken by missing libutilscallstack. am: f7fab104f9
Lorenzo Colitti [Tue, 23 Jan 2018 19:36:02 +0000 (19:36 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack. am: f7fab104f9
am: df4aba36b4

Change-Id: I904ec7dee1f4f565a1db138e45c9e5497fbb2855

6 years agoDisable IpConnectivityMetricsTest. am: b7a479c293
Lorenzo Colitti [Tue, 23 Jan 2018 19:33:27 +0000 (19:33 +0000)]
Disable IpConnectivityMetricsTest. am: b7a479c293
am: afb4ba1c35

Change-Id: Ic5a24e40ce126bc872281bb353706a245eb345f2

6 years agoAdd the defaultNetwork element to the netstats.proto. am: 9781f785bc
Lorenzo Colitti [Tue, 23 Jan 2018 19:30:57 +0000 (19:30 +0000)]
Add the defaultNetwork element to the netstats.proto. am: 9781f785bc
am: adcb94472a

Change-Id: I292e903617d3af1867529e68eb20538afb66f665

6 years agoAdd getDefaultNetwork to the NetworkStats public API. am: d5876bc438
Lorenzo Colitti [Tue, 23 Jan 2018 19:28:14 +0000 (19:28 +0000)]
Add getDefaultNetwork to the NetworkStats public API. am: d5876bc438
am: 66eab17abc

Change-Id: If0aa0a4522df0061645d34cb3af8a33f288ed46d

6 years agoMerge "Add checks to ensure SPIs are not reused"
Benedict Wong [Tue, 23 Jan 2018 19:27:51 +0000 (19:27 +0000)]
Merge "Add checks to ensure SPIs are not reused"
am: 0a1dd194aa

Change-Id: I893925014557e5ae13303debc4ee8f50faf9605d

6 years agoMerge "Added new slot status related broadcast."
Amit Mahajan [Tue, 23 Jan 2018 19:24:04 +0000 (19:24 +0000)]
Merge "Added new slot status related broadcast."
am: cdc0a084d1

Change-Id: Ia81c5648a943bf1c13b1434b40dd09c6789a6576

6 years agoMerge changes from topic "multipath-datausage-backport"
Lorenzo Colitti [Tue, 23 Jan 2018 19:17:54 +0000 (19:17 +0000)]
Merge changes from topic "multipath-datausage-backport"
am: df984fae26

Change-Id: Ic29d71ade161434b6dea796a887f60b5587ca1d5

6 years agoAdd metered, roaming, and defaultNetwork info to NetworkTemplate.
Lorenzo Colitti [Tue, 23 Jan 2018 19:13:30 +0000 (19:13 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
am: 0f9bce6883

Change-Id: I28e7f539fc5e0698cb8ef663aafae7a2cd579d68

6 years agoUnbreak frameworks-net tests broken by missing libutilscallstack.
Lorenzo Colitti [Tue, 23 Jan 2018 19:09:07 +0000 (19:09 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack.
am: f7fab104f9

Change-Id: I3125e9276da6cbbae5ef490cf98583b31c4ad8d2

6 years agoDisable IpConnectivityMetricsTest.
Lorenzo Colitti [Tue, 23 Jan 2018 19:04:05 +0000 (19:04 +0000)]
Disable IpConnectivityMetricsTest.
am: b7a479c293

Change-Id: Iba9dad4001c6aa725285eee6df32f116c846532d

6 years agoAdd the defaultNetwork element to the netstats.proto.
Lorenzo Colitti [Tue, 23 Jan 2018 18:57:44 +0000 (18:57 +0000)]
Add the defaultNetwork element to the netstats.proto.
am: 9781f785bc

Change-Id: I725132a756baacbc42c573274f5687cf58225498

6 years agoMerge "Add support for UsbDeviceManager to talk to USB GADGET HAL" am: bf996dd479...
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:56:48 +0000 (18:56 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL" am: bf996dd479  -s ours am: 5400d4dc4f
am: 26668b9056

Change-Id: I9611f6840b05566befbd3ab58705a38b81931598

6 years agoAdd getDefaultNetwork to the NetworkStats public API.
Lorenzo Colitti [Tue, 23 Jan 2018 18:50:20 +0000 (18:50 +0000)]
Add getDefaultNetwork to the NetworkStats public API.
am: d5876bc438

Change-Id: Ifbe3d8ede39c87d64eee20adcfbdd92479d09e69

6 years agoDeprecate location modes
Maggie [Thu, 4 Jan 2018 23:35:11 +0000 (15:35 -0800)]
Deprecate location modes

1. Mark public fields as deprecated: LOCATION_MODE, LOCATION_MODE_HIGH_ACCURACY, LOCATION_MODE_SENSORS_ONLY,
LOCATION_MODE_BATTERY_SAVING, LOCATION_MODE_OFF.

2. Add new public  methods to LocationManager:
setLocationEnabled(boolean)
isLocationEnabled()
setLocationProviderEnabled(String, boolean)

3. Remove LOCATION_PREVIOUS_MODE and constant
LOCATION_MODE_PREVIOUS. Refactor code that references
LOCATION_MODE_PREVIOUS to use LocationManager.setLocationEnabled or
LOCATION_MODE_HIGH_ACCURACY.

4. Mark deprecated fields and methods as removed: LOCATION_PROVIDERS_ALLOWED, setLocationProviderEnabled(), isLocationProviderEnabled()

5. Refactor logic in Settings app and Quick Settings to call
LocationManager.setLocationEnabled() instead of setting location mode.

Bug: 70990911
Test: Manual
Change-Id: Ia49b385f8b6a358b62291983eb0146af0ecf8e02

6 years agoMerge "Add support for UsbDeviceManager to talk to USB GADGET HAL" am: bf996dd479...
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:45:03 +0000 (18:45 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL" am: bf996dd479  -s ours
am: 5400d4dc4f

Change-Id: I4eab9733b7bf766f559c2423f534bc5d9b1a1066

6 years agoMerge changes from topic "User Switcher CP to Master"
Bryan Eyler [Tue, 23 Jan 2018 18:38:18 +0000 (18:38 +0000)]
Merge changes from topic "User Switcher CP to Master"

* changes:
  Fix users not showing up in fullscreen selection.
  Update user names on changes in settings/user.
  Add expand icon for user switcher.
  Cascade animation of users in switcher.
  Add pagination dots and fix animation of user switcher.

6 years agoMerge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:36:01 +0000 (18:36 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
am: bf996dd479  -s ours

Change-Id: I174f0a10e4ecb76607ed5e92e60ebf3a9523e6d9

6 years agoFix getAsuLevel returns "99" in Lte and TdScdma.
yifan.bai [Fri, 20 Oct 2017 02:25:11 +0000 (10:25 +0800)]
Fix getAsuLevel returns "99" in Lte and TdScdma.

GetAsuLevel method judges valid signal by
getLteLevel/getTdScdmaLevel. However, level is
SIGNAL_STRENGTH_NONE_OR_UNKNOWN does not mean not in
Lte/TdScdma.
For example, if mLteRsrp is in (threshRsrp[1],
threshRsrp[0]], getLteLevel would return
SIGNAL_STRENGTH_NONE_OR_UNKNOWN. But this only
means Lte signal is very weak, and ASU should be
(mLteRsrp + 140) not "99" (3GPP 27.007 Sec 8.69).

Bug: 72116430
Test: Build
Change-Id: If930c3e3d23a9af7b2e51e3560cc28607a6328c0

6 years agoMerge "Enable quickscrub with system prop flag"
TreeHugger Robot [Tue, 23 Jan 2018 18:26:10 +0000 (18:26 +0000)]
Merge "Enable quickscrub with system prop flag"

6 years agoCleanup SignalStrength Parcel
Nathan Harold [Fri, 19 Jan 2018 00:45:40 +0000 (16:45 -0800)]
Cleanup SignalStrength Parcel

Clean up the SignalStrength parcel. This CL
removes redundant constructors, simplifies the
overall initialization process, and stratifies
the components of the parcel into 2 separate
parts: the strength values from RIL, and the
config values provided by the platform.

Bug: 72116430
Test: runtest frameworks-telephony
Change-Id: Id7d2339362270b3911e96094275e1e545d6b581c

6 years agoMerge "Adding a new category to mark car-optimized launcher activity"
Roberto Perez [Tue, 23 Jan 2018 18:21:59 +0000 (18:21 +0000)]
Merge "Adding a new category to mark car-optimized launcher activity"

6 years agoAdd TransportType in AccessNetworkConstants.java
Malcolm Chen [Tue, 23 Jan 2018 00:00:29 +0000 (16:00 -0800)]
Add TransportType in AccessNetworkConstants.java

Bug: 64132030
Test: build
Change-Id: I916a0b889110195d23b2a531308171cf4ea74f0c

6 years agoMerge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
Treehugger Robot [Tue, 23 Jan 2018 18:14:00 +0000 (18:14 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."

6 years agoMerge "Atom: WifiMulticastLockStateChanged"
TreeHugger Robot [Tue, 23 Jan 2018 18:09:20 +0000 (18:09 +0000)]
Merge "Atom: WifiMulticastLockStateChanged"

6 years agoMerge "Shorter separator"
TreeHugger Robot [Tue, 23 Jan 2018 18:08:22 +0000 (18:08 +0000)]
Merge "Shorter separator"

6 years agoMove APIs to final location in preparation for API review
Robert Berry [Tue, 23 Jan 2018 11:59:59 +0000 (11:59 +0000)]
Move APIs to final location in preparation for API review

Leave old APIs in current location for backwards compatibility reasons.

Bug: 72298565
Test: Tried flow with current versions of GMSCore to ensure they work still
Change-Id: Iafc2b8ad8a574460dbb2482a67935debe71f1113

6 years agoMerge "Add checks to ensure SPIs are not reused"
Benedict Wong [Tue, 23 Jan 2018 18:00:06 +0000 (18:00 +0000)]
Merge "Add checks to ensure SPIs are not reused"

6 years agoMerge "Added new slot status related broadcast."
Treehugger Robot [Tue, 23 Jan 2018 18:00:00 +0000 (18:00 +0000)]
Merge "Added new slot status related broadcast."

6 years agoForce screenshots to heads-up priority.
Alison Cichowlas [Tue, 23 Jan 2018 01:46:38 +0000 (20:46 -0500)]
Force screenshots to heads-up priority.

Test: updated ChannelsTest; manually verified heads up ss posted and old channel deleted.

Change-Id: Iafc1c65d3e8a5929ba922a2814848ce5bc036747

6 years agoMerge "Improve dumpsys for installed distros"
Neil Fuller [Tue, 23 Jan 2018 17:54:29 +0000 (17:54 +0000)]
Merge "Improve dumpsys for installed distros"

6 years agopm: Scan as privileged apps that share a privileged user
Jeff Vander Stoep [Tue, 23 Jan 2018 09:16:18 +0000 (01:16 -0800)]
pm: Scan as privileged apps that share a privileged user

Bug: 72235911
Test: build/flash Taimen, verify userdictionary provider
    is scanned as priv-app.
Test: gts-tradefed run everything

Change-Id: I6b99135e1264a7ad7be818feb9a52c299349e96d

6 years agoMerge "Make us of the authsecret HAL."
Andrew Scull [Tue, 23 Jan 2018 17:43:59 +0000 (17:43 +0000)]
Merge "Make us of the authsecret HAL."

6 years agoMerge "Expose locales with alternative numbering systems."
Siyamed Sinir [Tue, 23 Jan 2018 17:35:59 +0000 (17:35 +0000)]
Merge "Expose locales with alternative numbering systems."

6 years agoMerge "Use numbering system for configuration selection."
Siyamed Sinir [Tue, 23 Jan 2018 17:35:59 +0000 (17:35 +0000)]
Merge "Use numbering system for configuration selection."

6 years agoMerge "Sync statsd google3 protos to aosp."
TreeHugger Robot [Tue, 23 Jan 2018 17:25:29 +0000 (17:25 +0000)]
Merge "Sync statsd google3 protos to aosp."

6 years agoMerge "Frameworks: Fix scoping problem in SQLite"
TreeHugger Robot [Tue, 23 Jan 2018 17:20:31 +0000 (17:20 +0000)]
Merge "Frameworks: Fix scoping problem in SQLite"