OSDN Git Service
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 16:43:31 +0000 (16:43 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit." am:
093c509c40
am:
031b91574d
Change-Id: I50385cb665a557baad8b271bcfd4431072db7592
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 16:37:13 +0000 (16:37 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit."
am:
093c509c40
Change-Id: I562562c1abc3a5a64820ca5eaa244f00a75c4200
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 15:11:14 +0000 (15:11 +0000)]
Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit."
Anton Hansson [Thu, 1 Mar 2018 11:53:43 +0000 (11:53 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am:
c164c83191
am:
9ee9e6b2b6
Change-Id: I984b5ee633078401769d3c649aa9b020715772df
Anton Hansson [Thu, 1 Mar 2018 11:46:29 +0000 (11:46 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
am:
c164c83191
Change-Id: Icd753634a498a9c1a2d2e27ad4e6cd788e7b9e1f
Przemyslaw Szczepaniak [Thu, 1 Mar 2018 10:35:57 +0000 (10:35 +0000)]
Tweak DateFormat.is24HourFormat javadoc to be more explicit.
Bug:
32761394
Test: make docs
Change-Id: If10da5b9d63e6e88774e333d5c266e423e6bc7c8
Anton Hansson [Thu, 1 Mar 2018 10:25:12 +0000 (10:25 +0000)]
Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
Chalard Jean [Thu, 1 Mar 2018 05:56:33 +0000 (05:56 +0000)]
Merge "Fix up NetworkCapabilities' toString" am:
7959e70ef2
am:
773523a667
Change-Id: I2f1578589232c49574dbf401d7f4becfa350a1c0
Chalard Jean [Thu, 1 Mar 2018 05:48:14 +0000 (05:48 +0000)]
Merge "Fix up NetworkCapabilities' toString"
am:
7959e70ef2
Change-Id: I21e66bc78a763f9e37725f50ca8b406ac7259518
Eric Schwarzenbach [Thu, 1 Mar 2018 05:47:20 +0000 (05:47 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up." am:
44d13875ff
am:
c870528371
Change-Id: I2b57a55e8bb36ba24578c00e2afaebfc21e0e4c3
Eric Schwarzenbach [Thu, 1 Mar 2018 05:38:49 +0000 (05:38 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up."
am:
44d13875ff
Change-Id: I37f039ea44114b48b44bce7174deb3d55b2667fc
Chalard Jean [Thu, 1 Mar 2018 04:01:16 +0000 (04:01 +0000)]
Merge "Fix up NetworkCapabilities' toString"
Treehugger Robot [Thu, 1 Mar 2018 03:48:32 +0000 (03:48 +0000)]
Merge "Plumb PhysicalChannelConfig all the way up."
Joe Maples [Thu, 1 Mar 2018 00:00:13 +0000 (00:00 +0000)]
Merge "pm: Fix typo in error" am:
a12e18bcd1
am:
a79fef132b
Change-Id: I45fa701a8f9e727e1a072f4f6dd773bba0de01aa
Joe Maples [Wed, 28 Feb 2018 23:49:49 +0000 (23:49 +0000)]
Merge "pm: Fix typo in error"
am:
a12e18bcd1
Change-Id: I924eef635de153a0277da49c804f2c7dc1c97a4d
Treehugger Robot [Wed, 28 Feb 2018 22:38:24 +0000 (22:38 +0000)]
Merge "pm: Fix typo in error"
Holly Jiuyu Sun [Wed, 28 Feb 2018 20:38:13 +0000 (20:38 +0000)]
Merge "Mark EUICC_PROVISIONED as @SystemApi." am:
4b5680b6fa
am:
41fa5ff101
Change-Id: Ie737a298f1ab342d571e150be452a9590e623052
Holly Jiuyu Sun [Wed, 28 Feb 2018 20:24:08 +0000 (20:24 +0000)]
Merge "Mark EUICC_PROVISIONED as @SystemApi."
am:
4b5680b6fa
Change-Id: I7e3542edd0d092d6b0a7bc10b80b0565dfefda7e
Joe Maples [Thu, 11 Jan 2018 16:09:46 +0000 (11:09 -0500)]
pm: Fix typo in error
instnat -> instant
Change-Id: Ie2f06840575fc266e3510252635ad17be65945b8
Signed-off-by: Joe Maples <joe@frap129.org>
Holly Jiuyu Sun [Wed, 28 Feb 2018 18:18:04 +0000 (18:18 +0000)]
Merge "Mark EUICC_PROVISIONED as @SystemApi."
Robert Sesek [Wed, 28 Feb 2018 18:16:43 +0000 (18:16 +0000)]
Merge "Delay starting the webview_zygote until first use." am:
6d9d717ab7
am:
99440a0ab8
Change-Id: Icf9297f730bc4fa779d989eccc05e436c5d463b6
Robert Sesek [Wed, 28 Feb 2018 18:07:09 +0000 (18:07 +0000)]
Merge "Delay starting the webview_zygote until first use."
am:
6d9d717ab7
Change-Id: I7a2c485fcf04a5728081f99610435a970dc4bb1b
Anton Hansson [Fri, 23 Feb 2018 12:57:51 +0000 (12:57 +0000)]
frameworks/base: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.
Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.
Test: make relevant packages
Bug:
73535841
Change-Id: Ibcffec873a693d1c792ca210fb597d2bf37e9068
Merged-In: I4233b9091d9066c4fa69f3d24aaf367ea500f760
Treehugger Robot [Wed, 28 Feb 2018 16:02:58 +0000 (16:02 +0000)]
Merge "Delay starting the webview_zygote until first use."
Steven Moreland [Wed, 28 Feb 2018 14:01:17 +0000 (14:01 +0000)]
Merge "Don't use cutils/Atomic.h" am:
07735797a2
am:
a272d540d8
Change-Id: Ie442c255e43f2ebe80ef5423aa4508930d72c44c
Steven Moreland [Wed, 28 Feb 2018 13:51:44 +0000 (13:51 +0000)]
Merge "Don't use cutils/Atomic.h"
am:
07735797a2
Change-Id: Ie56fadea498f35c7e820f9fadac1b64697565a78
Treehugger Robot [Wed, 28 Feb 2018 12:37:50 +0000 (12:37 +0000)]
Merge "Don't use cutils/Atomic.h"
Alexandru-Andrei Rotaru [Wed, 28 Feb 2018 11:25:14 +0000 (11:25 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
e8b557bc08 -s ours
am:
5217a34008 -s ours
Change-Id: I6672cd7a23ee7c6b5d384fae7111be2948f59e45
Alexandru-Andrei Rotaru [Wed, 28 Feb 2018 11:11:39 +0000 (11:11 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
am:
e8b557bc08 -s ours
Change-Id: I2a1805375252b56209ac9d18da0f1771f5b6187b
Chalard Jean [Mon, 26 Feb 2018 10:00:45 +0000 (19:00 +0900)]
Fix up NetworkCapabilities' toString
Test: manual
Change-Id: I3bcec6a6873e8ec7ced0820d3d5b92249b19fe0a
Treehugger Robot [Wed, 28 Feb 2018 10:03:02 +0000 (10:03 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
Alexandru-Andrei Rotaru [Tue, 18 Jul 2017 15:49:22 +0000 (16:49 +0100)]
Notify the user and turn off tethering when the service is disallowed.
Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering. Added notification
about
tethering being turned off. Also added Unit Tests to test the
functionality
of the UserRestrictionListener added.
Bug:
27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.
Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: I4a57137a7ad592ca186d9508d5cc2fad3f1bc985
Pavel Maltsev [Wed, 28 Feb 2018 08:28:25 +0000 (08:28 +0000)]
Merge "Add OEM_PAID network capability" am:
4c00edd361
am:
7b87c2050c
Change-Id: Ie0377fea66f784c910bd0a06f87543cc5cf82c84
Pavel Maltsev [Wed, 28 Feb 2018 08:14:48 +0000 (08:14 +0000)]
Merge "Add OEM_PAID network capability"
am:
4c00edd361
Change-Id: I2fb8825bc1038783ef45907846b52192b6fe5d18
Treehugger Robot [Wed, 28 Feb 2018 07:06:00 +0000 (07:06 +0000)]
Merge "Add OEM_PAID network capability"
fionaxu [Wed, 28 Feb 2018 05:03:13 +0000 (05:03 +0000)]
Merge "Don't throw exception if phone process is dead for carrier ID APIs" am:
8c32954906
am:
0713fcf66d
Change-Id: Iacf464a898da538795152135b0c40cd648bbdf7d
Holly Jiuyu Sun [Thu, 22 Feb 2018 04:34:22 +0000 (20:34 -0800)]
Mark EUICC_PROVISIONED as @SystemApi.
Bug:
35851809
Test: test on phone
Merged-In: I1627aeaf6846e889767fb4223c46fa278a751b23
Change-Id: I1627aeaf6846e889767fb4223c46fa278a751b23
Brad Ebinger [Wed, 28 Feb 2018 04:46:13 +0000 (04:46 +0000)]
Merge "Modify shouldProcessCall API to remove redundancy" am:
59391aa4a0
am:
8f2c2ca09a
Change-Id: Id4762516cce2f6f902542d0b15195e9531c2eda4
fionaxu [Wed, 28 Feb 2018 04:45:25 +0000 (04:45 +0000)]
Merge "Don't throw exception if phone process is dead for carrier ID APIs"
am:
8c32954906
Change-Id: Ia770310f6135df041bc1d84b09cfbdcda1debd2f
Cassie [Wed, 28 Feb 2018 04:36:03 +0000 (04:36 +0000)]
Merge "Add documentation for SECRET_CODE_ACTION according to API review process." am:
e6691d8e89
am:
f29d208045
Change-Id: Ib04ccee612d521818ac45f29895e604646286705
Brad Ebinger [Wed, 28 Feb 2018 04:33:28 +0000 (04:33 +0000)]
Merge "Modify shouldProcessCall API to remove redundancy"
am:
59391aa4a0
Change-Id: Iaf27b98f03c363ca23989c251f9e5d66bae394ba
Cassie [Wed, 28 Feb 2018 04:25:25 +0000 (04:25 +0000)]
Merge "Add documentation for SECRET_CODE_ACTION according to API review process."
am:
e6691d8e89
Change-Id: I0832ce666883a9054a9252ef93d50e615a64bc79
Treehugger Robot [Wed, 28 Feb 2018 03:14:45 +0000 (03:14 +0000)]
Merge "Don't throw exception if phone process is dead for carrier ID APIs"
Treehugger Robot [Wed, 28 Feb 2018 03:02:27 +0000 (03:02 +0000)]
Merge "Modify shouldProcessCall API to remove redundancy"
Treehugger Robot [Wed, 28 Feb 2018 02:30:44 +0000 (02:30 +0000)]
Merge "Add documentation for SECRET_CODE_ACTION according to API review process."
fionaxu [Tue, 27 Feb 2018 05:11:40 +0000 (21:11 -0800)]
Don't throw exception if phone process is dead for carrier ID APIs
Bug:
73772776
Test: Build
Change-Id: I81638f52d5d8ccf1005878ba4f3967e07169284b
(cherry picked from commit
331965e5d6f753cd061303607cdfbe9dff4be896)
Merged-in: I81638f52d5d8ccf1005878ba4f3967e07169284b
Jordan Liu [Wed, 28 Feb 2018 01:51:40 +0000 (01:51 +0000)]
Merge "Use 4 thresholds instead of 6" am:
fdebcf1ae2
am:
00fef4fb3d
Change-Id: If6f8e1f938298506068d87e008ab0de21b8ff6a3
Jordan Liu [Wed, 28 Feb 2018 01:39:58 +0000 (01:39 +0000)]
Merge "Use 4 thresholds instead of 6"
am:
fdebcf1ae2
Change-Id: Ie2d1ab2e79d0d3cc79815da7af4022e58838e5cd
Tetsutoki Shiozawa [Wed, 28 Feb 2018 00:12:33 +0000 (00:12 +0000)]
Merge "Fix: Double-free error on RemoteFillService" am:
5b04f89343
am:
b23ec4eaa7
Change-Id: I3acedf1add384730df6f987b0f20edb77b250228
Tetsutoki Shiozawa [Wed, 28 Feb 2018 00:00:01 +0000 (00:00 +0000)]
Merge "Fix: Double-free error on RemoteFillService"
am:
5b04f89343
Change-Id: I7e8872a28ee01f29710945ac692236fa94f3c13a
Jordan Liu [Tue, 27 Feb 2018 23:44:03 +0000 (23:44 +0000)]
Merge "Use 4 thresholds instead of 6"
Treehugger Robot [Tue, 27 Feb 2018 22:51:21 +0000 (22:51 +0000)]
Merge "Fix: Double-free error on RemoteFillService"
Jordan Liu [Sat, 24 Feb 2018 01:05:13 +0000 (17:05 -0800)]
Use 4 thresholds instead of 6
Min and max thresholds are fixed.
Bug:
73775507
Bug:
70698348
Test: manual and ServiceStateTrackerTest
Change-Id: Ie7fbda0627615f49b6205142c22ad48e88735f80
Merged-In: Ie7fbda0627615f49b6205142c22ad48e88735f80
Ajay Panicker [Tue, 27 Feb 2018 20:16:52 +0000 (20:16 +0000)]
Merge "AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume" am:
affa54f01c
am:
b351b63c2d
Change-Id: Ifc18e2f82aba2239fefa7a4fe46d8bb9e9f1c0d9
Ajay Panicker [Tue, 27 Feb 2018 20:07:49 +0000 (20:07 +0000)]
Merge "AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume"
am:
affa54f01c
Change-Id: I48e7236ea475674b9e67defa6814e2d9fbb4cc2b
Andreas Gampe [Tue, 27 Feb 2018 19:19:01 +0000 (19:19 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test" am:
4d9bec6b4a
am:
0e8e9472ba
Change-Id: I70e11136f6e261cccf4ce57f757f97999f74b402
Andreas Gampe [Tue, 27 Feb 2018 19:07:49 +0000 (19:07 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test"
am:
4d9bec6b4a
Change-Id: I0c684a434a0f43fcae1a766c6c84a756115d9dcb
Treehugger Robot [Tue, 27 Feb 2018 18:44:23 +0000 (18:44 +0000)]
Merge "AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume"
Treehugger Robot [Tue, 27 Feb 2018 17:30:23 +0000 (17:30 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test"
Ajay Panicker [Tue, 27 Feb 2018 00:04:15 +0000 (16:04 -0800)]
AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume
Use setAvrcpAbsoluteVolume() instead of adjustAvrcpAbsoluteVolume in
adjust stream volume in order to better sync device volume and remote
Bluetooth device volume. This will allow Bluetooth to avoid calculating
its own volume step size.
Bug:
68812037
Test: Connect to device that supports Absolute Volume and see that
volume changed occur when changing volume on device.
Change-Id: I26d5812ee1a5953b6527561ce5ad1c5d944c244d
Todd Poynor [Tue, 27 Feb 2018 16:44:28 +0000 (16:44 +0000)]
Merge "BackgroundDexOptService: skip low battery check if not present" am:
e90cba2115
am:
f45d0cb962
Change-Id: I4192f48a73098b1fc20cacccc6acfec2e40d8e99
Todd Poynor [Tue, 27 Feb 2018 16:33:11 +0000 (16:33 +0000)]
Merge "BackgroundDexOptService: skip low battery check if not present"
am:
e90cba2115
Change-Id: I451ea71fe64e3c309a8722a3d155453b1a609a8f
Treehugger Robot [Tue, 27 Feb 2018 15:24:28 +0000 (15:24 +0000)]
Merge "BackgroundDexOptService: skip low battery check if not present"
Neil Fuller [Tue, 27 Feb 2018 12:10:48 +0000 (12:10 +0000)]
Merge "Remove icu4j dependency." am:
6963081c5b
am:
794be8d45f
Change-Id: Idd805b56e75dab3c586847b5fdc9eaf8db248d58
Neil Fuller [Tue, 27 Feb 2018 12:04:25 +0000 (12:04 +0000)]
Merge "Remove icu4j dependency."
am:
6963081c5b
Change-Id: Ifc8cd0946bd069837fb46f3f8f9d85df715ab4de
Treehugger Robot [Tue, 27 Feb 2018 10:41:12 +0000 (10:41 +0000)]
Merge "Remove icu4j dependency."
Jack He [Tue, 27 Feb 2018 10:03:56 +0000 (10:03 +0000)]
Merge "Bluetooth: Add config value for max connected audio devices" am:
5a8339c9a5
am:
e6ddc3e436
Change-Id: I67b90b63ca88d912b81f869fce5def24c09d5f72
Jack He [Tue, 27 Feb 2018 09:54:44 +0000 (09:54 +0000)]
Merge "Bluetooth: Add config value for max connected audio devices"
am:
5a8339c9a5
Change-Id: I87d763899661fa0f4c1eb32ed0c2fac9a88355a3
Treehugger Robot [Tue, 27 Feb 2018 08:41:43 +0000 (08:41 +0000)]
Merge "Bluetooth: Add config value for max connected audio devices"
Jack He [Tue, 27 Feb 2018 05:04:31 +0000 (21:04 -0800)]
Bluetooth: Add config value for max connected audio devices
Bug:
64767509
Test: read config values in Bluetooth app
Change-Id: Ia5dd2fc1c16272082f11ac886e02b838575ceedd
Mohamed Abdalkader [Tue, 27 Feb 2018 04:11:32 +0000 (04:11 +0000)]
Merge "Add more sms error codes" am:
c16da498d5
am:
8a9d38fbbc
Change-Id: Idaecf961390d15987e9d5c93fb21a796da33d989
Mohamed Abdalkader [Tue, 27 Feb 2018 04:03:19 +0000 (04:03 +0000)]
Merge "Add more sms error codes"
am:
c16da498d5
Change-Id: Id19bb14ebea3b0124af3a5990613a15d8c2fa44c
Treehugger Robot [Tue, 27 Feb 2018 02:48:31 +0000 (02:48 +0000)]
Merge "Add more sms error codes"
Todd Poynor [Wed, 21 Feb 2018 04:11:43 +0000 (20:11 -0800)]
BackgroundDexOptService: skip low battery check if not present
If no battery is present, assume no need to check for low battery.
Do not interpret battery level values if battery is not present.
Bug:
34507420
Test: manual (temporary log messages with battery forced not present)
Change-Id: Iebc64bc890808d583d0bd95a31f17b6363b7ba40
Merged-In: Iebc64bc890808d583d0bd95a31f17b6363b7ba40
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
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
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"
Andreas Gampe [Mon, 26 Feb 2018 23:55:49 +0000 (23:55 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test"
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"
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
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 Sesek [Mon, 26 Feb 2018 21:54:03 +0000 (16:54 -0500)]
Delay starting the webview_zygote until first use.
During boot, WebViewZygote.setMultiprocessEnabled() is called by the
WebView initialization logic. Starting the WebViewZygote here causes a
slowdown in the system_server boot process, so delay launching the
zygote until it is needed.
Previously the webview_zygote was launched by init, and merely
connecting to it in the boot process didn't have significant overhead.
Bug:
73743583
Bug:
63749735
Test: Boot a device, verify that webview_zygote process is not running.
Test: Launch "Third-party licenses" activity from Settings, and it
renders correctly via the WebView.
Change-Id: I1352a5df95e4a793ac64862c439ba2573ddd2d18
Neil Fuller [Mon, 26 Feb 2018 20:38:26 +0000 (20:38 +0000)]
Remove icu4j dependency.
This dependency is no longer required: it was added
for libcore when libcore was implemented in terms of
com.icu classes. libcore has since moved to android.icu
(in core-libart) and so the droiddoc dependency is no
longer required.
Test: make droid docs
Merged-In: I6e4e79a7df201fdc2cefa60037adf831593eaa0f
Change-Id: I6e4e79a7df201fdc2cefa60037adf831593eaa0f
Holly Jiuyu Sun [Mon, 26 Feb 2018 21:03:23 +0000 (21:03 +0000)]
Merge "Add hashCode() in UiccAccessRule."
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
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
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
Tetsutoki Shiozawa [Fri, 23 Feb 2018 04:16:56 +0000 (13:16 +0900)]
Fix: Double-free error on RemoteFillService
Symptom:
RemoteFillService was crashed due to IllegalArgumentException
"Service not registered:" at onServiceConnected.
Root cause:
RemoteFillService#onServiceConnected tries to unbind the connection
if mDestroyed is flagged or mBinding is not flagged. It always fails
with IllegalArgumentException.
Both mDestroyed and !mBinding mean the connection was unbound.
You can't unbind the unbound connection. It's not allowed.
Fixes:
73864601
Fixes:
69905688
Change-Id: If5481468ddac7be41accad63e9d5382bc6c029fd
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 16:06:30 +0000 (08:06 -0800)]
Frameworks: Annotate JUnit4 test with @Test
Mollify Errorprone.
Bug:
72076216
Test: m javac-check RUN_ERROR_PRONE=true
Test: atest IpSecServiceParameterizedTest
Change-Id: Ia3a253c4c5994937efc0f498ac047c5fb4eee3e9
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
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
Treehugger Robot [Mon, 26 Feb 2018 10:54:28 +0000 (10:54 +0000)]
Merge "Slightly refactor IPv4 default router interface selection"
Tetsutoki Shiozawa [Mon, 26 Feb 2018 07:50:37 +0000 (07:50 +0000)]
Merge "Definitely abort reconnecting to native daemon during shutdown" am:
2fd5af1036
am:
282c038240
Change-Id: I034072b89d0a8b9362940155ae2e2d173fde1b33