OSDN Git Service
TreeHugger Robot [Tue, 27 Feb 2018 02:19:26 +0000 (02:19 +0000)]
Merge "Make a11y shortcut robust to services w/no summary"
Naoyuki Konda [Tue, 27 Feb 2018 02:16:40 +0000 (02:16 +0000)]
Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" am:
d676c5c134 am:
1d2ddbb9ae
am:
5f676ad625
Change-Id: I33817c1902c72aac417865287d137f8e1e919480
TreeHugger Robot [Tue, 27 Feb 2018 02:13:46 +0000 (02:13 +0000)]
Merge "[Magnifier-26] Wire up frame callback for realsies"
Android Build Merger (Role) [Tue, 27 Feb 2018 02:10:26 +0000 (02:10 +0000)]
Merge "Merge "Frameworks: Annotate JUnit4 test with @Test" am:
3a12454f9a am:
af8f4b192d am:
b4654687ef"
Andreas Gampe [Tue, 27 Feb 2018 02:09:58 +0000 (02:09 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test" am:
3a12454f9a am:
af8f4b192d
am:
b4654687ef
Change-Id: I7904252d10121901349e49c62577a98f06355cba
Jaewan Kim [Tue, 27 Feb 2018 02:07:59 +0000 (02:07 +0000)]
Merge "MediaSession2: Unhide APIs"
Naoyuki Konda [Tue, 27 Feb 2018 02:03:54 +0000 (02:03 +0000)]
Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" am:
d676c5c134
am:
1d2ddbb9ae
Change-Id: Ib137d185149dca4ae5117f6c32f610281960123a
Andreas Gampe [Tue, 27 Feb 2018 01:54:13 +0000 (01:54 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test" am:
3a12454f9a
am:
af8f4b192d
Change-Id: Id390ce18897982a278b0b8b74650e45fa25e5a36
Naoyuki Konda [Tue, 27 Feb 2018 01:50:43 +0000 (01:50 +0000)]
Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL"
am:
d676c5c134
Change-Id: Ie81e3f51647b866fbe1f6b2d0e93d5f3e7696837
Andreas Gampe [Tue, 27 Feb 2018 01:45:38 +0000 (01:45 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test"
am:
3a12454f9a
Change-Id: I9c6001ca771d3d2dfd1bdda10661cc685ff0d7bd
TreeHugger Robot [Tue, 27 Feb 2018 01:01:50 +0000 (01:01 +0000)]
Merge "BackgroundDexOptService: skip low battery check if not present"
Jaewan Kim [Thu, 22 Feb 2018 11:46:17 +0000 (20:46 +0900)]
MediaSession2: Unhide APIs
Bug:
64098437
Test: make update-api
Change-Id: Ib73a32b422502cef324869356d56acaa7c48b219
Jayachandran Chinnakkannu [Tue, 27 Feb 2018 00:53:32 +0000 (00:53 +0000)]
Merge "Add support for sending message with priority, link control and validity period options" am:
b103f9309b am:
bb29858d7f
am:
0000a9b623
Change-Id: I5da271b0f113844b7ad393a051078af602fa518d
Jayachandran Chinnakkannu [Tue, 27 Feb 2018 00:43:26 +0000 (00:43 +0000)]
Merge "Add support for sending message with priority, link control and validity period options" am:
b103f9309b
am:
bb29858d7f
Change-Id: I0c7c425c6a8b0ee9ee7ae4695bb7f62b1e75da79
Jayachandran Chinnakkannu [Tue, 27 Feb 2018 00:35:44 +0000 (00:35 +0000)]
Merge "Add support for sending message with priority, link control and validity period options"
am:
b103f9309b
Change-Id: I0a641c9d8d4bf7ce9cf78333f68424cea5c879df
Lucas Dupin [Mon, 26 Feb 2018 05:57:17 +0000 (21:57 -0800)]
Fix scrim busyness regression
Scrim opacity on the keyguard should vary according to how many
notifications are visible.
A busy lock screen has a more opaque scrim, and an empty lock screen
has a more transparent scrim.
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Test: swipe away or receive notifications on the keyguard
Change-Id: I672b5e1a82d65dd326b40069d61223c3c0161493
TreeHugger Robot [Tue, 27 Feb 2018 00:09:25 +0000 (00:09 +0000)]
Merge "Fix issue where status bar would have wrong colors"
Treehugger Robot [Tue, 27 Feb 2018 00:02:34 +0000 (00:02 +0000)]
Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL"
TreeHugger Robot [Mon, 26 Feb 2018 23:59:40 +0000 (23:59 +0000)]
Merge "Fix issue #
73818011: Please fix build error on frameworks/base"
Andreas Gampe [Mon, 26 Feb 2018 23:55:49 +0000 (23:55 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test"
Lucas Dupin [Mon, 26 Feb 2018 23:53:43 +0000 (15:53 -0800)]
Fix issue where status bar would have wrong colors
Test: set white wallpaper, adb shell "stop && start"
Change-Id: I8b030f15ca38d3a792b547084ca465174c314f1d
Fixes:
73285247
TreeHugger Robot [Mon, 26 Feb 2018 23:52:55 +0000 (23:52 +0000)]
Merge "Don't fade away clock when QS expands"
TreeHugger Robot [Mon, 26 Feb 2018 23:49:23 +0000 (23:49 +0000)]
Merge "Allow TouchDelegate to forward non-primary pointer"
TreeHugger Robot [Mon, 26 Feb 2018 23:48:34 +0000 (23:48 +0000)]
Merge "Prevent quickscrub/switch from occuring when keyguard is up"
Makoto Onuki [Mon, 26 Feb 2018 23:26:54 +0000 (15:26 -0800)]
Fix AppStateTrackerTest.loadPersistedAppOps
Bug:
73792882
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/AppStateTrackerTest.java
Change-Id: Id17b828f911a002f0a33f4beea22b4372f9c18ce
TreeHugger Robot [Mon, 26 Feb 2018 23:25:54 +0000 (23:25 +0000)]
Merge "Add WifiWake metrics proto to WifiLog"
TreeHugger Robot [Mon, 26 Feb 2018 23:23:26 +0000 (23:23 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 26 Feb 2018 23:23:08 +0000 (23:23 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 26 Feb 2018 23:22:59 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 26 Feb 2018 23:22:41 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 26 Feb 2018 23:22:37 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 26 Feb 2018 23:22:33 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 26 Feb 2018 23:22:13 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 26 Feb 2018 23:22:08 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 26 Feb 2018 23:19:02 +0000 (23:19 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 26 Feb 2018 23:18:57 +0000 (23:18 +0000)]
Merge "Fixes timebase used when dumping reports."
Matthew Ng [Fri, 23 Feb 2018 00:03:29 +0000 (16:03 -0800)]
Prevent quickscrub/switch from occuring when keyguard is up
When activity over lockscreen is visible and keyguard is up, user will
not be able to start quickscrub.
Change-Id: I018e0b448cdcc3d71a1f782959d633b7bc5dd627
Fixes:
73709365
Test: manual - at lockscreen launch camera and try to quickscrub
Bill Yi [Mon, 26 Feb 2018 23:11:54 +0000 (15:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ieff91a5d73b90c2c07fa7ced06178ab4c74e723e
Auto-generated-cl: translation import
Bill Yi [Mon, 26 Feb 2018 23:09:55 +0000 (15:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4e0ec8ed24c614241247f6513f2d77848553eb91
Auto-generated-cl: translation import
Jayachandran Chinnakkannu [Mon, 26 Feb 2018 22:53:22 +0000 (22:53 +0000)]
Merge "Add support for sending message with priority, link control and validity period options"
Chavi Weingarten [Mon, 26 Feb 2018 22:52:50 +0000 (22:52 +0000)]
Merge "Always store last inset values in relayoutWindow"
Bill Yi [Mon, 26 Feb 2018 22:38:22 +0000 (14:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I521f23607bf345ff51627adaf460e4128db8eb4b
Auto-generated-cl: translation import
Holly Jiuyu Sun [Mon, 26 Feb 2018 22:36:33 +0000 (22:36 +0000)]
Merge "Add hashCode() in UiccAccessRule." am:
0da1f09f9b am:
ab8e1a47f1
am:
e45fda114b -s ours
Change-Id: I9c6c86c093c0c5b4c662cbd1b2a6cbea0d2740f8
Bill Yi [Mon, 26 Feb 2018 22:35:56 +0000 (14:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I14b92123bf896532085b7efb9801c08d295801f2
Auto-generated-cl: translation import
TreeHugger Robot [Mon, 26 Feb 2018 22:29:16 +0000 (22:29 +0000)]
Merge "Improve output of voice interaction test app."
Bill Yi [Mon, 26 Feb 2018 22:29:07 +0000 (14:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: I30b4cf6c9fc5ca3f785ddb332a37311604947f8a
Auto-generated-cl: translation import
Holly Jiuyu Sun [Mon, 26 Feb 2018 22:27:13 +0000 (22:27 +0000)]
Merge "Add hashCode() in UiccAccessRule." am:
0da1f09f9b
am:
ab8e1a47f1
Change-Id: I90525e35faf2d3bb6c142bce33e054ac76cbcba9
Bill Yi [Mon, 26 Feb 2018 22:25:29 +0000 (14:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I62dfd4781526bada6fc331acb92b9837e3650baa
Auto-generated-cl: translation import
Bill Yi [Mon, 26 Feb 2018 22:23:18 +0000 (14:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibf41cb667e8c427b6d33544b6ba396889b3b131e
Auto-generated-cl: translation import
Bill Yi [Mon, 26 Feb 2018 22:21:21 +0000 (14:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06f2b120049c681bbe06045e2e4b81ef9a7cac26
Auto-generated-cl: translation import
Holly Jiuyu Sun [Mon, 26 Feb 2018 22:18:57 +0000 (22:18 +0000)]
Merge "Add hashCode() in UiccAccessRule."
am:
0da1f09f9b
Change-Id: I91b9c8e17d4480dbc6a27735e39a90f7c8e59c9d
Robert Berry [Mon, 26 Feb 2018 22:15:27 +0000 (22:15 +0000)]
Merge "Fix minor documentation issues in RecoveryController"
Phil Weaver [Mon, 26 Feb 2018 21:17:28 +0000 (13:17 -0800)]
Make a11y shortcut robust to services w/no summary
Fixes:
73254116
Test: Configure shortcut for TestBack. Now works.
Also adding test to internal test that fails without
this change.
Change-Id: I6bb1359f80c5e0145997bc107fe1580686edb30e
TreeHugger Robot [Mon, 26 Feb 2018 21:23:12 +0000 (21:23 +0000)]
Merge "Display connected AP when there are no scanresults"
Andreas Gampe [Mon, 26 Feb 2018 21:13:40 +0000 (21:13 +0000)]
Merge "SettingsLib: Fix assertThat in test"
Holly Jiuyu Sun [Mon, 26 Feb 2018 21:03:23 +0000 (21:03 +0000)]
Merge "Add hashCode() in UiccAccessRule."
TreeHugger Robot [Mon, 26 Feb 2018 20:55:30 +0000 (20:55 +0000)]
Merge "Fix texture image internalformat/type validation."
Jerry Zhang [Mon, 26 Feb 2018 20:49:35 +0000 (20:49 +0000)]
Merge "Initialize functions as NONE in legacy handler."
Jakub Pawlowski [Mon, 26 Feb 2018 19:38:59 +0000 (19:38 +0000)]
Merge "Use assigned UUID for Hearing Aid Service" am:
d310970d36 am:
7f2091c522
am:
8d03a60930
Change-Id: I4c255621db616337c20d8e239dfe409545dea18a
Andreas Gampe [Mon, 26 Feb 2018 19:36:41 +0000 (11:36 -0800)]
SettingsLib: Fix assertThat in test
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.
Found by errorprone.
Bug:
73513670
Test: atest WifiTrackerTest
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ic16cded73ad5192d6c32033e41e72e39277729c6
Jakub Pawlowski [Mon, 26 Feb 2018 19:31:12 +0000 (19:31 +0000)]
Merge "Use assigned UUID for Hearing Aid Service" am:
d310970d36
am:
7f2091c522
Change-Id: I3e54498760d071a38d60467c2865a77374f8c928
Bill Yi [Thu, 22 Feb 2018 09:59:05 +0000 (01:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I48d6e66b551c266eea94e89bca665ced033d0239
Auto-generated-cl: translation import
Jakub Pawlowski [Mon, 26 Feb 2018 19:23:28 +0000 (19:23 +0000)]
Merge "Use assigned UUID for Hearing Aid Service"
am:
d310970d36
Change-Id: I6b62de2142ba9957609aeb166574fd75bce83834
Mihai Popa [Fri, 23 Feb 2018 16:10:11 +0000 (16:10 +0000)]
[Magnifier-26] Wire up frame callback for realsies
Test: none yet
Bug:
73810478
Bug:
72041926
Change-Id: I7154ed4b3d2cd820dc8c8ff55eed130be87d1606
Zhizhi Liu [Mon, 26 Feb 2018 19:22:04 +0000 (19:22 +0000)]
Merge "Move IconCache to SettingsLib(I)."
TreeHugger Robot [Mon, 26 Feb 2018 19:15:17 +0000 (19:15 +0000)]
Merge "Put line feed to the test case"
TreeHugger Robot [Mon, 26 Feb 2018 19:08:49 +0000 (19:08 +0000)]
Merge "Print heartbeat information in job dumpsys"
Robert Berry [Mon, 26 Feb 2018 19:00:29 +0000 (19:00 +0000)]
Fix minor documentation issues in RecoveryController
Test: none, just doc updates
Change-Id: I7d2152f788a65162d72dbd9970230a9a07034014
TreeHugger Robot [Mon, 26 Feb 2018 18:49:54 +0000 (18:49 +0000)]
Merge "No heavy processing on UID observer thread"
Holly Jiuyu Sun [Thu, 22 Feb 2018 23:47:27 +0000 (15:47 -0800)]
Add hashCode() in UiccAccessRule.
hashCode() and equals() should appear together.
Bug:
73785903
Test: test on phone
Merged-In: I7f9d8943f6a0e1039815e21ff6dfe035bd674639
Change-Id: I7f9d8943f6a0e1039815e21ff6dfe035bd674639
chaviw [Sat, 24 Feb 2018 00:46:38 +0000 (16:46 -0800)]
Always store last inset values in relayoutWindow
Last insets are currently set when updateResizingWindowIfNeeded
is called. However, sometimes the precondition in that method fails
so the method returns early before updating last inset values.
This causes issues if the call stack was from relayoutWindow since
relayoutWindow sends the new insets back to the client. The client
will then get the new values, but the server didn't store them as
the last seen values. This will cause bad behavior because the
next time insets are changed, the server may not update the
client since it doesn't think anything has changed.
This fix ensures that the server always updates the last inset values
when the client gets and update to ensure the value are always the
same.
Fixes:
70518605
Test: Issue in bug is fixed
Test: atest WindowManagerSmokeTest
Change-Id: Ic70da0b3caa02462df29395799d305eee7baf42d
Jakub Pawlowski [Mon, 26 Feb 2018 18:12:26 +0000 (18:12 +0000)]
Merge "Use assigned UUID for Hearing Aid Service"
Jakub Pawlowski [Thu, 22 Feb 2018 23:10:08 +0000 (15:10 -0800)]
Use assigned UUID for Hearing Aid Service
Test: manual
Bug:
64038649
Change-Id: Iab748db944df3bba8927973d0a55d95514b9f8ed
Andreas Gampe [Mon, 26 Feb 2018 18:06:24 +0000 (18:06 +0000)]
Merge "Frameworks: Annotate JUnit4 tests with @Test & @Ignore"
TreeHugger Robot [Mon, 26 Feb 2018 17:34:07 +0000 (17:34 +0000)]
Merge "Deprecate all inner classes of FingerprintManager"
Lucas Dupin [Sun, 25 Feb 2018 03:42:06 +0000 (19:42 -0800)]
Don't fade away clock when QS expands
QS isn't transparent anymore, the clock shouldn't fade away.
Fading out the clock was introduced in O-MR1 to avoid the contrast
between the white clock and the wallpaper.
Test: visual
Test: drag panel until bouncer almost shows up, release it
Bug:
73830624
Change-Id: I8b31a40cebf7dc2109db34cafc2701925fceabf5
Narayan Kamath [Mon, 26 Feb 2018 17:11:50 +0000 (17:11 +0000)]
Merge "CoreTests: Tidy up legacy tests."
Mike Digman [Mon, 26 Feb 2018 17:09:22 +0000 (17:09 +0000)]
Merge "Fix hard to touch and stuck navbar rotate icon"
TreeHugger Robot [Mon, 26 Feb 2018 16:59:29 +0000 (16:59 +0000)]
Merge "Remove incorrectly specified @UserIdInt"
Andreas Gampe [Fri, 23 Feb 2018 02:06:44 +0000 (18:06 -0800)]
Frameworks: Annotate JUnit4 tests with @Test & @Ignore
Mollify Errorprone.
Bug:
72076216
Bug:
73792882
Test: m javac-check RUN_ERROR_PRONE=true
Test: m RunFrameworksServicesRoboTests
Test: atest AppStateTrackerTest
Test: atest ActivityRecordTests
Change-Id: I8c496067e850a6c1dc17fdadc0a39c621e3a2f68
Vladislav Kuzkokov [Mon, 26 Feb 2018 16:11:10 +0000 (16:11 +0000)]
Merge "Check printing restriction for correct user."
Andreas Gampe [Fri, 23 Feb 2018 02:06:44 +0000 (18:06 -0800)]
Frameworks: Annotate JUnit4 test with @Test
Mollify Errorprone.
Bug:
72076216
Test: m javac-check RUN_ERROR_PRONE=true
Test: atest CredentialTest
Change-Id: I07635124a306f82e5442a45a1fd61edc63c015a2
TreeHugger Robot [Mon, 26 Feb 2018 16:02:34 +0000 (16:02 +0000)]
Merge "Revert "Add deep link to the assisted dialing settings.""
TreeHugger Robot [Mon, 26 Feb 2018 16:02:34 +0000 (16:02 +0000)]
Merge "Revert "Add the assisted dialing carrier config.""
TreeHugger Robot [Mon, 26 Feb 2018 15:38:58 +0000 (15:38 +0000)]
Merge "Remove obsolete pragma statements"
Jorim Jaggi [Mon, 26 Feb 2018 15:27:44 +0000 (15:27 +0000)]
Merge "Fix ANR for real"
Nicolas Capens [Mon, 26 Feb 2018 13:18:30 +0000 (08:18 -0500)]
Fix texture image internalformat/type validation.
checkInternalFormat() was not properly checking that the Skia bitmap
color type matches the OpenGL format and type combination. In some
cases this would lead to visual artifacts (e.g. when a 565 type is
uploaded to a 4444 type), while in other cases it would cause reading
out of bounds (e.g. when uploading Alpha_8 with a GL_RGBA format).
Note that valid Bitmap formats are documented at
https://developer.android.com/reference/android/graphics/Bitmap.Config.html
checkInternalFormat() now also matches getInternalFormat() and
getType().
Bug:
73084222
Change-Id: I47cb08657c7d03723d3318c99e0da94434d80ee6
TreeHugger Robot [Mon, 26 Feb 2018 15:16:18 +0000 (15:16 +0000)]
Merge "Remove account param from generateKey method"
TreeHugger Robot [Mon, 26 Feb 2018 15:06:15 +0000 (15:06 +0000)]
Merge "Tear down broadcast receiver in RemoteInputView and SmartReplyView tests"
Bernardo Rufino [Mon, 26 Feb 2018 15:02:06 +0000 (15:02 +0000)]
Merge "Remove FrameworkShadowPackageManager"
TreeHugger Robot [Mon, 26 Feb 2018 14:52:19 +0000 (14:52 +0000)]
Merge "Remove account from WrappedApplicationKey"
Jaewan Kim [Mon, 26 Feb 2018 14:50:48 +0000 (14:50 +0000)]
Merge "MediaMetadata2: Add radio frequency and callsigns"
Jaewan Kim [Thu, 22 Feb 2018 07:46:17 +0000 (16:46 +0900)]
MediaMetadata2: Add radio frequency and callsigns
This is request from the Android Auto Embeded, where the Android is
running on the car kit and needs support radio application
Test: Run all MediaComponents tests once
Change-Id: I09780878ac3a1075c79f51879ffb76913a8215a2
Erik Kline [Mon, 26 Feb 2018 13:29:19 +0000 (13:29 +0000)]
Merge "Slightly refactor IPv4 default router interface selection" am:
701421c6c9 am:
95c373341e
am:
8ac26bad64
Change-Id: I7ab4b7b3eaa7c81d58990747f3f894e8f9dacfd6
Erik Kline [Mon, 26 Feb 2018 13:20:31 +0000 (13:20 +0000)]
Merge "Slightly refactor IPv4 default router interface selection" am:
701421c6c9
am:
95c373341e
Change-Id: I39795019a58b2c91bd427775e304e4b1b934db85
Erik Kline [Mon, 26 Feb 2018 13:06:33 +0000 (13:06 +0000)]
Merge "Slightly refactor IPv4 default router interface selection"
am:
701421c6c9
Change-Id: I1c8b9f95c8711c191e0e95cf72a5f4e5a3c3fc53
Petr Cermak [Fri, 23 Feb 2018 15:54:34 +0000 (15:54 +0000)]
Tear down broadcast receiver in RemoteInputView and SmartReplyView tests
Bug:
73803843
Test: atest RemoteInputViewTest SmartReplyViewTest
Change-Id: Iea933874fd76d445971864c743dd02b20ff1e1e9
TreeHugger Robot [Mon, 26 Feb 2018 12:42:11 +0000 (12:42 +0000)]
Merge "Add test for KeyChainSnapshot Parcelable"
TreeHugger Robot [Mon, 26 Feb 2018 11:58:16 +0000 (11:58 +0000)]
Merge "Remove MediaSession2Record"
Robert Berry [Mon, 26 Feb 2018 00:23:06 +0000 (00:23 +0000)]
Add test for KeyChainSnapshot Parcelable
Bug:
73811828
Test: runtest frameworks-core -p android.security.keystore.recovery
Change-Id: I9448ff791f4f8b82621df2d4343febdce86dbf42