OSDN Git Service
Paul Duffin [Tue, 16 Jan 2018 11:52:20 +0000 (11:52 +0000)]
Merge "Replace legacy-test with android.test.base in bp files" am:
2285630e4b am:
caacf3e7c4
am:
2b3bf45c73
Change-Id: I0c4b7705176b0ae7eb4b06bf5a138757d6b16e9c
Paul Duffin [Tue, 16 Jan 2018 11:40:57 +0000 (11:40 +0000)]
Merge "Replace legacy-test with android.test.base in bp files" am:
2285630e4b
am:
caacf3e7c4
Change-Id: I0fa822af057afc2f4efb6285404653fe57bcd742
Paul Duffin [Tue, 16 Jan 2018 11:29:21 +0000 (11:29 +0000)]
Merge "Replace legacy-test with android.test.base in bp files"
am:
2285630e4b
Change-Id: If956b45e21b7d576daf5dcece9c1acea35d952a0
Oscar Key [Tue, 16 Jan 2018 11:17:00 +0000 (11:17 +0000)]
Merge "Add FLAG_INCREMENTAL and FLAG_NON_INCREMENTAL to performBackup()."
Paul Duffin [Tue, 16 Jan 2018 10:47:47 +0000 (10:47 +0000)]
Merge "Replace legacy-test with android.test.base in bp files"
Hugo Benichi [Tue, 16 Jan 2018 10:40:56 +0000 (10:40 +0000)]
Merge "MacAddress: add @NonNull annotations" am:
e65a016d76 am:
a7c125e5b2
am:
697b7fe9e1
Change-Id: Ib525e2429609ce12c2be5bbeacffa217b65bebe3
Hugo Benichi [Tue, 16 Jan 2018 10:30:20 +0000 (10:30 +0000)]
Merge "MacAddress: add @NonNull annotations" am:
e65a016d76
am:
a7c125e5b2
Change-Id: Icaa08c082797c6dbc3382e0662e24e1c84114175
Hugo Benichi [Tue, 16 Jan 2018 10:18:55 +0000 (10:18 +0000)]
Merge "MacAddress: add @NonNull annotations"
am:
e65a016d76
Change-Id: Ia1ea828cfd33b5287639e4fd3ab248a58650168b
Neil Fuller [Tue, 16 Jan 2018 08:39:16 +0000 (08:39 +0000)]
Merge "Remove code no longer used by telephony"
TreeHugger Robot [Tue, 16 Jan 2018 07:46:28 +0000 (07:46 +0000)]
Merge "Gauge metric e2e test"
Hugo Benichi [Tue, 16 Jan 2018 07:10:50 +0000 (07:10 +0000)]
Merge "MacAddress: add @NonNull annotations"
TreeHugger Robot [Tue, 16 Jan 2018 05:50:08 +0000 (05:50 +0000)]
Merge changes I3d7cef4e,Ie0f43f54
* changes:
Add missing @Override when {@inheritDoc} exists
Remove unnecessary qualifiers from InputConnection
Lorenzo Colitti [Tue, 16 Jan 2018 05:32:55 +0000 (05:32 +0000)]
Merge "Change the netId to nethandle mapping." am:
9456c020d8 am:
feaf412e19
am:
93e0bad422
Change-Id: I06e09bfaeb1040b97afa392faace339eb5bab4ad
Lorenzo Colitti [Tue, 16 Jan 2018 05:16:34 +0000 (05:16 +0000)]
Merge "Change the netId to nethandle mapping." am:
9456c020d8
am:
feaf412e19
Change-Id: Idd1b2f462c1c78bdb68b43a4aa77bf2358f7cb52
Lorenzo Colitti [Tue, 16 Jan 2018 05:06:50 +0000 (05:06 +0000)]
Merge "Change the netId to nethandle mapping."
am:
9456c020d8
Change-Id: I605ea54ff9e8e32e4fad6f0346b37849fadbc81a
Yangster-mac [Fri, 12 Jan 2018 00:16:26 +0000 (16:16 -0800)]
Gauge metric e2e test
Test: new test passed
Change-Id: I6a8bceb43fbb6e7b82f47951e71b5620779f2ceb
Hugo Benichi [Fri, 12 Jan 2018 00:46:29 +0000 (09:46 +0900)]
MacAddress: add @NonNull annotations
This patch adds to the MacAddress class:
- getAddressType() method which replaces addressType(), for naming
consistency
- @NonNull annotations on all input and output reference values for
all public methods (@hide and public).
TYPE_UNKNOWN, which currently cannot be observed with a non @hide
method, is also removed from the public api.
Bug:
71866627
Test: $ runtest frameworks-net
Change-Id: I2af70408d46f431b7b32183e6b48ddae9a261a2c
Yohei Yukawa [Tue, 16 Jan 2018 03:43:38 +0000 (19:43 -0800)]
Add missing @Override when {@inheritDoc} exists
Otherwise, Checkstyle keeps nagging us with the following lint warning
whenever we touch the lines around them.
Must include @java.lang.Override annotation when {@inheritDoc}
Javadoc tag exists.
This CL also re-format the license header just to make Checkstyle
happy.
This is purely a no-op style change. There must be no behavior change.
Test: prebuilts/checkstyle/checkstyle.py -f frameworks/base/core/java/android/view/inputmethod/InputConnectionWrapper.java
Change-Id: I3d7cef4e6c1407a6c6d8ee75c0d8b75943d8701c
Yohei Yukawa [Tue, 16 Jan 2018 03:43:27 +0000 (19:43 -0800)]
Remove unnecessary qualifiers from InputConnection
Otherwise, Checkstyle keeps nagging us whenever we touch lines around
them.
This CL also re-formats the license header and keep all the lines
within 100 colmun just to make Checkstyle happy.
This is purely a no-op style change. There must be no behavior change.
Test: prebuilts/checkstyle/checkstyle.py -f frameworks/base/core/java/android/view/inputmethod/InputConnection.java
Change-Id: Ie0f43f545d8056884c5d20a601d0a501187062c7
Treehugger Robot [Tue, 16 Jan 2018 02:58:56 +0000 (02:58 +0000)]
Merge "Change the netId to nethandle mapping."
Hugo Benichi [Tue, 16 Jan 2018 02:42:53 +0000 (02:42 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled" am:
46e9e35835 am:
2d59e3cab0
am:
d50943d086
Change-Id: I7cb4d1e9e1fc3dc5ca116dcc94840920cd4a3d64
Hugo Benichi [Tue, 16 Jan 2018 02:31:48 +0000 (02:31 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled" am:
46e9e35835
am:
2d59e3cab0
Change-Id: Icadee616fc95e1c126285524dfe49331fcf87462
Hugo Benichi [Tue, 16 Jan 2018 02:18:29 +0000 (02:18 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled"
am:
46e9e35835
Change-Id: I2abc857093879955eae62802f152c96c1ee942f3
Seigo Nonaka [Tue, 16 Jan 2018 00:47:52 +0000 (00:47 +0000)]
Merge "Rename PremeasuredText to MeasuredText"
Hugo Benichi [Tue, 16 Jan 2018 00:20:52 +0000 (00:20 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled"
TreeHugger Robot [Mon, 15 Jan 2018 19:57:27 +0000 (19:57 +0000)]
Merge "Dispatch overlay change to WindowManager"
TreeHugger Robot [Mon, 15 Jan 2018 19:28:31 +0000 (19:28 +0000)]
Merge "Remove saturation effect from screen-off anim"
Tomasz Wasilczyk [Mon, 15 Jan 2018 18:54:19 +0000 (18:54 +0000)]
Merge "Implement front-end APIs for dynamic program list."
TreeHugger Robot [Mon, 15 Jan 2018 18:31:34 +0000 (18:31 +0000)]
Merge "Tag brightness APIs with @SystemAPI"
Oscar Key [Sat, 13 Jan 2018 17:21:49 +0000 (17:21 +0000)]
Add FLAG_INCREMENTAL and FLAG_NON_INCREMENTAL to performBackup().
These indicate if backup manager passed any previous state to the backup
agent when building a backup. The transport will use these to decide
whether to clear any existing encryption related state for the app.
I left the new flags as @hide for now.
Bug: b/
71792427
Test: Tested manually with a buid of GmsCore updated to process the new
flag. I am attempting to write a robolectric test.
Change-Id: Ica0f6f578cd7d1ad29af532a45a2ee6685c84747
TreeHugger Robot [Mon, 15 Jan 2018 17:58:26 +0000 (17:58 +0000)]
Merge "Letterbox: Ignore light status bar flags for letterboxed windows"
Richard Ledley [Mon, 15 Jan 2018 17:40:46 +0000 (17:40 +0000)]
Merge "Add flag to control smart linkify."
Lucas Dupin [Mon, 15 Jan 2018 17:31:42 +0000 (09:31 -0800)]
Remove saturation effect from screen-off anim
Effect is starting to look dated and we're going with a simple
fade out in P.
Bug:
64155983
Test: Open coloful image, press power button
Change-Id: I1f31b4c79d4cd8d7ea8e0a32936bdb8498fe2c4c
Lorenzo Colitti [Tue, 5 Sep 2017 02:15:37 +0000 (11:15 +0900)]
Change the netId to nethandle mapping.
Being able to update this handle is necessary to ensure that
system-only OTAs do not break vendor code that relies on
nethandles.
Bug:
63052780
Test: walleye builds, boots, networking works
Test: MultinetworkApiTest CTS tests passes
Change-Id: I049a4ad2610ca68b8f56377b63be7e5e8ce76039
TreeHugger Robot [Mon, 15 Jan 2018 17:07:21 +0000 (17:07 +0000)]
Merge "Switch legacy-test to android.test.base to match AOSP"
Neil Fuller [Tue, 9 Jan 2018 18:38:08 +0000 (18:38 +0000)]
Remove code no longer used by telephony
This code was previously used by telephony
but was removed by frameworks/opt/telephony
commit
a0f09cee0f6328ea104b9ef965a387b4a4652e8a
Bug:
63743683
Test: make droid
Change-Id: I83deffc2aadc098e1c976bf164a752e19b96c77a
TreeHugger Robot [Mon, 15 Jan 2018 16:52:25 +0000 (16:52 +0000)]
Merge "Remove @SystemApi from the fields of R.styleable (part 2)"
Tomasz Wasilczyk [Tue, 9 Jan 2018 00:46:09 +0000 (16:46 -0800)]
Implement front-end APIs for dynamic program list.
Bug:
69860743
Test: instrumentation
Change-Id: I326865c690d315b867626599174e34911564ef9e
TreeHugger Robot [Mon, 15 Jan 2018 16:16:17 +0000 (16:16 +0000)]
Merge "Move letterboxing to AppWinToken"
TreeHugger Robot [Mon, 15 Jan 2018 15:58:49 +0000 (15:58 +0000)]
Merge "DisplayCutout: Move emulation into resource overlay"
vichang [Mon, 15 Jan 2018 15:55:31 +0000 (15:55 +0000)]
Merge "Add a new API android.icu.util.LocaleData" am:
9cb0b52011 am:
926407257d
am:
431e690a80 -s ours
Change-Id: I06f93267315c3da2fecd46db2e234b7de52de437
Paul Duffin [Mon, 15 Jan 2018 15:47:47 +0000 (15:47 +0000)]
Replace legacy-test with android.test.base in bp files
The legacy-test target is deprecated and will be replaced by
android.test.base. This replaces a few usages of the legacy-test target
in Android.bp files with android.test.base.
Bug:
30188076
Test: make checkbuild
Change-Id: I3575f638114fe2a3b703e67837496346bde24472
vichang [Mon, 15 Jan 2018 15:40:02 +0000 (15:40 +0000)]
Merge "Add a new API android.icu.util.LocaleData" am:
9cb0b52011
am:
926407257d
Change-Id: I5c9449a9778a8a09df43ae779a3188969077e797
TreeHugger Robot [Mon, 15 Jan 2018 15:32:28 +0000 (15:32 +0000)]
Merge "Update transport tests for binding on-demand to support SDK 26 API"
vichang [Mon, 15 Jan 2018 15:26:31 +0000 (15:26 +0000)]
Merge "Add a new API android.icu.util.LocaleData"
am:
9cb0b52011
Change-Id: I159748036ae2a59ea79cf191ec4cf19ba1f5bbad
Paul Duffin [Mon, 15 Jan 2018 15:15:15 +0000 (15:15 +0000)]
Switch legacy-test to android.test.base to match AOSP
Bug:
30188076
Test: make checkbuild
Change-Id: I359b8840304656e9c9c08b1e7367a6b088202064
Erik Kline [Mon, 15 Jan 2018 14:54:30 +0000 (14:54 +0000)]
Merge "change NMS removeNetwork to netd binder variant" am:
e61ee4198e am:
b73571b981
am:
ddeaa31b7d
Change-Id: I38905b12f24f16860de1db18cd12d93fc661c684
Erik Kline [Mon, 15 Jan 2018 14:38:08 +0000 (14:38 +0000)]
Merge "change NMS removeNetwork to netd binder variant" am:
e61ee4198e
am:
b73571b981
Change-Id: I6de7f38c7081e14d817cc7aad44cb5b6a978328b
Adrian Roos [Wed, 10 Jan 2018 16:32:27 +0000 (17:32 +0100)]
Letterbox: Ignore light status bar flags for letterboxed windows
Fixes an issue where letterboxed windows would still apply the
light status bar flag, even though the status bar was letterboxed
to black.
Bug:
65689439
Test: Enable cutout emulation, open "all apps" on launcher, verify status bar icons are visible
Change-Id: I9ce9560eedcc9cc2c1907478f7c4f4a1002c7235
Adrian Roos [Tue, 19 Dec 2017 18:08:05 +0000 (19:08 +0100)]
Move letterboxing to AppWinToken
Both letterboxes for filling the DisplayCutout area and to satisfy
maxAspectRatio constraints are moved to AppWindowToken.
Bug:
65689439
Test: adb shell cmd overlay enable com.android.internal.display.cutout.emulation && adb shell stop && adb shell start; verify Launcher has a black bar
Test: on a 18:9 device, open a legacy app. Ensure it has a proper max aspect ratio letterbox.
Change-Id: I8fd7802ce5ce14b8aa71232c62dc4283351b3021
Erik Kline [Mon, 15 Jan 2018 14:28:48 +0000 (14:28 +0000)]
Merge "change NMS removeNetwork to netd binder variant"
am:
e61ee4198e
Change-Id: I789653740c8cb1bb879215eaa3101f56d5bf7096
TreeHugger Robot [Mon, 15 Jan 2018 13:56:36 +0000 (13:56 +0000)]
Merge "Move startUserInBackground to standalone and avoid user from being stopped unnecessarily"
vichang [Mon, 15 Jan 2018 13:55:54 +0000 (13:55 +0000)]
Merge "Add a new API android.icu.util.LocaleData"
vichang [Mon, 15 Jan 2018 13:53:29 +0000 (13:53 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException" am:
a5fed7f526 am:
3c84896ced
am:
7d5e542dd9 -s ours
Change-Id: I778da1f78b1244e6bad6f13c16725500e39e05b4
Adrian Roos [Fri, 5 Jan 2018 15:14:34 +0000 (16:14 +0100)]
DisplayCutout: Move emulation into resource overlay
Bug:
65689439
Test: atest PhoneWindowManagerLayoutTest
Test: adb shell cmd overlay enable com.android.internal.display.cutout.emulation && adb shell stop && adb shell start
Change-Id: I7a319c28da53f78f884556cf176e01321b9c6b55
vichang [Mon, 15 Jan 2018 13:37:49 +0000 (13:37 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException" am:
a5fed7f526
am:
3c84896ced
Change-Id: Iea46598fce566f6075428cca9b10279dcb28eae4
TreeHugger Robot [Mon, 15 Jan 2018 13:37:35 +0000 (13:37 +0000)]
Merge "Remove redundant comments"
vichang [Mon, 15 Jan 2018 13:21:57 +0000 (13:21 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException"
am:
a5fed7f526
Change-Id: I30faa7bfd7076f86abce9b31c546d1e49e34e7da
Richard Ledley [Mon, 15 Jan 2018 13:13:29 +0000 (13:13 +0000)]
Add flag to control smart linkify.
Test: manual
Change-Id: If72f031b37ed313828d97d500af587bed6e8383b
Treehugger Robot [Mon, 15 Jan 2018 12:39:09 +0000 (12:39 +0000)]
Merge "change NMS removeNetwork to netd binder variant"
Annie Meng [Mon, 15 Jan 2018 12:10:38 +0000 (12:10 +0000)]
Update transport tests for binding on-demand to support SDK 26 API
After Robo 3.5.1 upgrade, these tests should support the new SDK.
Bug:
69153972
Test: m -j RunFrameworkServicesRoboTests
Change-Id: I12be8668b0c8bb7933cc1a30717356d86f1f3737
vichang [Mon, 15 Jan 2018 11:56:58 +0000 (11:56 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException"
yuemingw [Wed, 10 Jan 2018 18:59:43 +0000 (18:59 +0000)]
Add DISALLOW_AMBIENT_DISPLAY.
Bug:
67675787
Test: cts will be added in b/
67675794
Change-Id: Ic859783e05e54ea88d98db517891d41353ad033d
TreeHugger Robot [Mon, 15 Jan 2018 11:26:06 +0000 (11:26 +0000)]
Merge "Making TextClassifier helper objects parcelable"
Erik Kline [Mon, 15 Jan 2018 08:05:07 +0000 (17:05 +0900)]
change NMS removeNetwork to netd binder variant
Also: require NETWORK_STACK instead of CONNECTIVITY_INTERNAL.
Bug:
34953048
Bug:
64133961
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net
Change-Id: I26f07f51a8a2f4a8bb43a276da7c5e66c355c848
Rubin Xu [Mon, 15 Jan 2018 09:04:22 +0000 (09:04 +0000)]
Remove redundant comments
Bug:
63911046
Test: compiles
Change-Id: I0428f3c8d9675d8dcddba306f9569e6b3fc9b4c2
TreeHugger Robot [Mon, 15 Jan 2018 02:19:15 +0000 (02:19 +0000)]
Merge changes I30b40c48,I7d02c54c,Id68ebd35
* changes:
Use lambda when appropriate
Remove redundant type casts
Fix JavaDoc errors
Yohei Yukawa [Mon, 15 Jan 2018 00:30:59 +0000 (16:30 -0800)]
Use lambda when appropriate
This is a safe refactoring that should have no behavior change in
terms of semantics and performance characteristics.
Test: make -j checkbuild
Change-Id: I30b40c483e490ff42c1c707233ca5cc7b67da28f
Yohei Yukawa [Mon, 15 Jan 2018 00:24:26 +0000 (16:24 -0800)]
Remove redundant type casts
Test: make -j checkbuild
Change-Id: I7d02c54c09543848711c1f3204719a79593a3cbd
Yohei Yukawa [Mon, 15 Jan 2018 00:15:31 +0000 (16:15 -0800)]
Follow method renamings
This is a follow up CL to a recent CL [1], which deprecated several
APIs InputMethodManager class but forgot to update some of existing
call sites in InputMethodService to use new method names.
This CL only addresses deprecated API usage warnings. There should be
no behavior change.
[1]: I3163f3cbe557c85103ca287bee0874a3b4194032
d8d03a8e1b5b7f4b05d7f99a19d356ffd95edb58
Bug:
70282603
Test: atest CtsInputMethodTestCases
Change-Id: I709ca997523ac9a9cd2d236f3158bbb18cf2edc3
Yohei Yukawa [Mon, 15 Jan 2018 00:06:16 +0000 (16:06 -0800)]
Fix JavaDoc errors
Test: make -j checkbuild
Change-Id: Id68ebd3588cd286c821da49e3bda4299d311e8b9
Paul Duffin [Sat, 13 Jan 2018 21:36:33 +0000 (21:36 +0000)]
Merge "Remove junit classes from legacy-android-test" am:
4418418adb am:
d724c112f3
am:
8e632576ed
Change-Id: I5b8f7a0c93e90741f0eba1d0761d2c26e8b24513
Paul Duffin [Sat, 13 Jan 2018 21:25:58 +0000 (21:25 +0000)]
Merge "Remove junit classes from legacy-android-test" am:
4418418adb
am:
d724c112f3
Change-Id: I82688070910b342152f4076425ac2fedbf41be7c
Paul Duffin [Sat, 13 Jan 2018 21:13:12 +0000 (21:13 +0000)]
Merge "Remove junit classes from legacy-android-test"
am:
4418418adb
Change-Id: Id2966fd487ff95aa5a8e485756366df804765800
Paul Duffin [Sat, 13 Jan 2018 19:33:39 +0000 (19:33 +0000)]
Merge "Remove junit classes from legacy-android-test"
TreeHugger Robot [Sat, 13 Jan 2018 16:40:41 +0000 (16:40 +0000)]
Merge "Implement DISALLOW_SHARE_INTO_MANAGED_PROFILE"
Paul Duffin [Sat, 13 Jan 2018 16:34:31 +0000 (16:34 +0000)]
Remove @SystemApi from the fields of R.styleable (part 2)
Fix fields missed by previous change
Ica8cdcc7bbb40b4476c39db247d744f5e870cd06.
Bug:
67891551
Test: m -j checkapi does not report an error and cts/tests/signature/runSignatureTests.sh
Change-Id: I1a7b4a68fff6883085d420a41ad1f30bf03ffad5
Paul Duffin [Sat, 13 Jan 2018 13:10:35 +0000 (13:10 +0000)]
Merge changes from topic "fix-legacy-android-test-spam" am:
22bd015cba am:
fdc58270ef
am:
765a976936 -s ours
Change-Id: I5fe3e5d0e1b955a279646c6d1701f79c1700a773
Paul Duffin [Sat, 13 Jan 2018 13:04:50 +0000 (13:04 +0000)]
Move legacy-test to test-base am:
2141827700 am:
3f200744ae
am:
14e8a359da -s ours
Change-Id: I573351f84fc18e4a1b4ca8fe63675e9c87f8113f
Paul Duffin [Sat, 13 Jan 2018 11:22:25 +0000 (11:22 +0000)]
Merge changes from topic "fix-legacy-android-test-spam" am:
22bd015cba
am:
fdc58270ef
Change-Id: I2f6dca4843d6f61efee1577ba5e88d16844cfbfe
Paul Duffin [Sat, 13 Jan 2018 11:17:46 +0000 (11:17 +0000)]
Move legacy-test to test-base am:
2141827700
am:
3f200744ae
Change-Id: I50ea451e6f8c80e47b7ff28b128d713e24aeb5f0
Paul Duffin [Sat, 13 Jan 2018 11:06:08 +0000 (11:06 +0000)]
Merge changes from topic "fix-legacy-android-test-spam"
am:
22bd015cba
Change-Id: Ib2be0591aba3b4a2f6b06becc9cd3f5de1a40532
Paul Duffin [Sat, 13 Jan 2018 11:00:30 +0000 (11:00 +0000)]
Move legacy-test to test-base
am:
2141827700
Change-Id: I231aa9f47f0bb8d6985eedc4db6630772dcc8c27
Paul Duffin [Fri, 12 Jan 2018 16:08:35 +0000 (16:08 +0000)]
Remove junit classes from legacy-android-test
A mistake during the conversion of the legacy-android-test target from
Android.mk to Android.bp caused some junit classes to be accidentally
included in the legacy-android-test target. That caused some warnings
about duplicate classes to be output during the build.
The junit classes are being included as part of the static library
android.test.runner. This fixes that by adding a new
android.test.runner-minus-junit which excludes the junit classes
and then using that instead.
Test: make checkbuild
Change-Id: Icd00b38c64d3416a55c1055f9716ddb78ec278f8
Paul Duffin [Sat, 13 Jan 2018 09:33:05 +0000 (09:33 +0000)]
Merge changes from topic "fix-legacy-android-test-spam"
* changes:
Added new android.test.base targets
Move legacy-test to test-base
Dmitry Dementyev [Sat, 13 Jan 2018 09:00:26 +0000 (09:00 +0000)]
Merge "Refactor KeyStore Recovery Manager."
zxuan [Sat, 13 Jan 2018 07:06:17 +0000 (07:06 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state." am:
895148087b am:
5cea30c4ec
am:
78d54b01df
Change-Id: I798433851c10c7dc252d8773e6bbf1d3608ce66d
zxuan [Sat, 13 Jan 2018 05:55:22 +0000 (05:55 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state." am:
895148087b
am:
5cea30c4ec
Change-Id: Ife2ac4b12d698f6db09bb3194eaea6994357828d
zxuan [Sat, 13 Jan 2018 05:42:00 +0000 (05:42 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state."
am:
895148087b
Change-Id: I1c3e4b67c4ab3e21f955b5fffcc2e019c73d6140
Dmitry Dementyev [Sat, 13 Jan 2018 03:14:07 +0000 (19:14 -0800)]
Refactor KeyStore Recovery Manager.
1) Parameters -> Params
2) Use byte[] for serivice parameters.
2) Move Exception into separate class.
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I1b9a8748830f7deb9eeb57693f5a818a49a7aabe
Treehugger Robot [Sat, 13 Jan 2018 04:09:42 +0000 (04:09 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state."
Jack Yu [Sat, 13 Jan 2018 03:56:10 +0000 (03:56 +0000)]
Merge "Used LinkAddress insteaad of InterfaceAddress" am:
277c7d248c am:
bd681cab22
am:
25993fc579 -s ours
Change-Id: I3dfed09e54d3484096101d4eee141fcd4b91c905
Jack Yu [Sat, 13 Jan 2018 03:32:58 +0000 (03:32 +0000)]
Merge "Used LinkAddress insteaad of InterfaceAddress" am:
277c7d248c
am:
bd681cab22
Change-Id: Ic683f7fcc854e0e44e145da1fafc58f76f580637
Jack Yu [Sat, 13 Jan 2018 03:18:58 +0000 (03:18 +0000)]
Merge "Used LinkAddress insteaad of InterfaceAddress"
am:
277c7d248c
Change-Id: Ib5f7151d0738e73067e734d7943cdc5b734a1039
Sanket Padawe [Sat, 13 Jan 2018 02:59:49 +0000 (02:59 +0000)]
Merge "Add permission check for old call handover apis." am:
e8fc3d2399 am:
7a97ee9acd
am:
440bd9cb05
Change-Id: Ibd08720dba54949234376d5a5ca021c722330091
Sanket Padawe [Sat, 13 Jan 2018 02:39:06 +0000 (02:39 +0000)]
Merge "Add permission check for old call handover apis." am:
e8fc3d2399
am:
7a97ee9acd
Change-Id: I864f2e645fd5ffd76ebd1e0d44a99c8f0b006504
TreeHugger Robot [Sat, 13 Jan 2018 02:34:55 +0000 (02:34 +0000)]
Merge "Treat ACTION_CANCEL as ACTION_UP for magnification"
TreeHugger Robot [Sat, 13 Jan 2018 02:32:04 +0000 (02:32 +0000)]
Merge "Prevent race condition when iterating over bound services"
Sanket Padawe [Sat, 13 Jan 2018 02:22:21 +0000 (02:22 +0000)]
Merge "Add permission check for old call handover apis."
am:
e8fc3d2399
Change-Id: I27f8d4eabbf979404ca5954161f0973012a4c484
TreeHugger Robot [Sat, 13 Jan 2018 02:02:39 +0000 (02:02 +0000)]
Merge "Turn on app info v2 feature."