OSDN Git Service
Lucas Dupin [Thu, 24 May 2018 16:33:14 +0000 (16:33 +0000)]
Revert "WallpaperColors hint computation"
This reverts commit
c50f47d970b474371938f33e46b13ae2dd040df0.
Fixes:
79465234
Reason for revert: Google still does it using private APIs and apps were relying on this behavior, not good for the ecosystem.
Change-Id: I62e2b4cd1e6e562fcdd89c97e599bcdade83381a
Lucas Dupin [Fri, 2 Mar 2018 21:10:42 +0000 (13:10 -0800)]
WallpaperColors hint computation
Public WallpaperColors surface should not compute hints, malicious apps
might use theme inversion to slow down the system.
Change-Id: I9d14259e433b1047d2512b3d994524dca5e8531a
Fixes:
69532159
Test: set white wallpaper, black wallpaper, observe theme changing
Test: runtest -x services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java
Hyundo Moon [Mon, 5 Mar 2018 05:44:41 +0000 (05:44 +0000)]
Merge "MediaController2: Ensure NonNull for parameters of public methods"
TreeHugger Robot [Mon, 5 Mar 2018 05:43:44 +0000 (05:43 +0000)]
Merge "Add #alerts to StatsdStats printout"
Hyundo Moon [Wed, 28 Feb 2018 08:31:00 +0000 (17:31 +0900)]
MediaController2: Ensure NonNull for parameters of public methods
Bug:
73863865
Test: Passed MediaBrowser2Test
Change-Id: I65cd43045f4e7b9f16b8cf3f43688815e59dc643
TreeHugger Robot [Mon, 5 Mar 2018 01:23:19 +0000 (01:23 +0000)]
Merge "AID: Change loop to repeat and set from xml"
TreeHugger Robot [Mon, 5 Mar 2018 01:12:19 +0000 (01:12 +0000)]
Merge "Make OnHeaderDecodedListener NonNull"
TreeHugger Robot [Sun, 4 Mar 2018 22:53:05 +0000 (22:53 +0000)]
Merge "Adds two more metrics categories for ATV Settings."
TreeHugger Robot [Sun, 4 Mar 2018 17:47:14 +0000 (17:47 +0000)]
Merge "Fix crash with AppComponentFactory"
Jaewan Kim [Fri, 2 Mar 2018 06:55:12 +0000 (15:55 +0900)]
MediaSession2: Clean up TODOs under frameworks/base/services
This CL includes following changes
- Remove outdated TODOs
- Added buganizer issue if the remaining work takes more than 5m
Test: Run MediaComponents tests
Change-Id: I0bda68dba58a71824107b58527f71cc1f8d1f949
Jaewan Kim [Fri, 2 Mar 2018 05:13:10 +0000 (14:13 +0900)]
MediaSession2: Clean up TODOs under frameworks/base/media
This CL includes following changes
- Remove outdated TODOs
- Added buganizer issue if the remaining work take more than 5m
Test: Run MediaComponents tests
Change-Id: I8968e12aabcbc67f69dbf14485b3716d0e95779b
TreeHugger Robot [Sun, 4 Mar 2018 04:29:55 +0000 (04:29 +0000)]
Merge "Fix link-type check warning on com.android.nfc_extras"
Yuan Lu [Sun, 4 Mar 2018 01:29:08 +0000 (01:29 +0000)]
Merge "Add the flag for only alowing wifi on charger/network request option"
Lucas Dupin [Sun, 4 Mar 2018 00:44:51 +0000 (00:44 +0000)]
Merge "Delete legacy code"
TreeHugger Robot [Sat, 3 Mar 2018 23:36:37 +0000 (23:36 +0000)]
Merge "Revert "Introduce InputConnection#reportLanguageHint()""
Bryce Lee [Sat, 3 Mar 2018 14:50:57 +0000 (14:50 +0000)]
Merge "Address destroying activities multiple times."
Bill Yi [Sat, 3 Mar 2018 13:26:44 +0000 (13:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
5b67a302d4 -s ours
am:
5f311906c0 -s ours
Change-Id: I437186c5c0ce68e4b9a3136aa44cef70a997a890
Bill Yi [Sat, 3 Mar 2018 13:18:11 +0000 (13:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
5b67a302d4 -s ours
Change-Id: Ieab93fb1ab78ad5633e328eee9c59616239ea487
TreeHugger Robot [Sat, 3 Mar 2018 12:01:20 +0000 (12:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 3 Mar 2018 09:18:51 +0000 (09:18 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba am:
ceb2e462f8 am:
462e72e57d
am:
5c9582b417
Change-Id: I9205bf86b72a9f727a19a7b2a7dc61555be1792b
Bill Yi [Sat, 3 Mar 2018 09:12:25 +0000 (09:12 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours am:
d1ed6e90b2 -s ours am:
7e354b0ffe -s ours
am:
8dcf817d44 -s ours
Change-Id: I1f340310ff1a1e528e647728de149e5ef588ae4e
Bill Yi [Sat, 3 Mar 2018 08:52:05 +0000 (08:52 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299 am:
585ba6b3ec am:
cfa5b7fa32
am:
f611143dcb
Change-Id: I0ef4467e0affe88d14c132b277774ca208d4e83a
Bill Yi [Sat, 3 Mar 2018 08:51:12 +0000 (08:51 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba am:
ceb2e462f8
am:
462e72e57d
Change-Id: I50253fa1812ff0b944219513c2c99598e0b75d8e
Bill Yi [Sat, 3 Mar 2018 08:44:59 +0000 (08:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours am:
d1ed6e90b2 -s ours
am:
7e354b0ffe -s ours
Change-Id: Ic8151011ed5e74939d74d567765f10817abced9e
Bill Yi [Sat, 3 Mar 2018 08:44:57 +0000 (08:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours am:
6a223c3aaa -s ours am:
3d12b053bc -s ours
am:
b8d90e47ef -s ours
Change-Id: I27d3617e32d59dde9324bf63a3912d12c6604816
Bill Yi [Sat, 3 Mar 2018 08:23:19 +0000 (08:23 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1 am:
bf7981bf90 am:
aed8d39fe7
am:
b1974396f9
Change-Id: I158fa5d27c9d02c1c76f362f035de6c00a2f29e5
Bill Yi [Sat, 3 Mar 2018 08:22:31 +0000 (08:22 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299 am:
585ba6b3ec
am:
cfa5b7fa32
Change-Id: I12fa15bd34e438b3a26dbb0bcfafb2e6b0148deb
Bill Yi [Sat, 3 Mar 2018 08:21:46 +0000 (08:21 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba
am:
ceb2e462f8
Change-Id: I1d0313a868fd0083b78994912746f1fbe5acf714
Bill Yi [Sat, 3 Mar 2018 08:15:59 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours
am:
d1ed6e90b2 -s ours
Change-Id: I6afd2c8ac6b486398cd0cc9d051d5ebef456bfaa
Bill Yi [Sat, 3 Mar 2018 08:15:50 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours am:
7d05ce8473 -s ours am:
db8a0233a4 -s ours
am:
515556988f -s ours
Change-Id: Ic42ab0f8da9f3473ffcbfca130298ea185851802
Bill Yi [Sat, 3 Mar 2018 08:15:40 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours am:
6a223c3aaa -s ours
am:
3d12b053bc -s ours
Change-Id: Id2eeb3af6cd35bae85d1dedbcf8bf450534195b8
Bill Yi [Sat, 3 Mar 2018 08:09:41 +0000 (08:09 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299
am:
585ba6b3ec
Change-Id: I70d1513b0c85f9a31eafe5cb1785e47ab7e29ed9
Bill Yi [Sat, 3 Mar 2018 08:05:08 +0000 (08:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours
am:
6a223c3aaa -s ours
Change-Id: Idf18f2f7f59f15c12ed1f18c337f6a08913b7f34
Bill Yi [Sat, 3 Mar 2018 07:56:54 +0000 (07:56 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3 am:
bad5ea4cb1 am:
0c557735b7
am:
83e2dc6874
Change-Id: I1b634dcf6691cd68c72d6241045f8cfe467d97fc
Bill Yi [Sat, 3 Mar 2018 07:55:51 +0000 (07:55 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1 am:
bf7981bf90
am:
aed8d39fe7
Change-Id: Id390a60af18718f4eb375318c3ea8eb1a2f85e10
Bill Yi [Sat, 3 Mar 2018 07:49:06 +0000 (07:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours am:
1f6fdce0b0 -s ours am:
b90a10513e -s ours
am:
9d9ea4c320 -s ours
Change-Id: I98975c0659945be13e318b5a296fa849768eea3a
Bill Yi [Sat, 3 Mar 2018 07:49:05 +0000 (07:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours am:
7d05ce8473 -s ours
am:
db8a0233a4 -s ours
Change-Id: I8e64f428f1fc95d5387459a3f25c94e9bace9377
Bill Yi [Sat, 3 Mar 2018 07:37:08 +0000 (07:37 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1
am:
bf7981bf90
Change-Id: Ib3e91f95f6bb6cde1c65be0d3cd9a9e3b45b0e7e
Bill Yi [Sat, 3 Mar 2018 07:36:55 +0000 (07:36 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3 am:
bad5ea4cb1
am:
0c557735b7
Change-Id: I84b3def855146d6db4d9bd623e9e96c89e8081d4
Bill Yi [Sat, 3 Mar 2018 07:32:32 +0000 (07:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60 am:
fa863f597e -s ours am:
3d82e195f7 -s ours am:
0f9e3adcda -s ours
am:
2bbfea01e4 -s ours
Change-Id: Ib8fd9e360d017c7e8e2170d274485639435e3b44
Bill Yi [Sat, 3 Mar 2018 07:31:51 +0000 (07:31 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev
am:
ee97cf22ba
Change-Id: Ia9e780f378a33f48434d1e98760091d3642c8990
Bill Yi [Sat, 3 Mar 2018 07:30:57 +0000 (07:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours
am:
7d05ce8473 -s ours
Change-Id: I5c502117018ae3a155feaacd0e72ce14c302728b
Bill Yi [Sat, 3 Mar 2018 07:29:59 +0000 (07:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours am:
1f6fdce0b0 -s ours
am:
b90a10513e -s ours
Change-Id: Iebc8057fc5a7fb58e90bc71db5dd25a456583e12
Bill Yi [Sat, 3 Mar 2018 07:29:56 +0000 (07:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd
am:
4cd38db343 -s ours
Change-Id: I1800067c2cb7ca5de32951338f2548390c396fad
Masaho Nishikawa [Sat, 3 Mar 2018 07:28:54 +0000 (07:28 +0000)]
Merge "Add config to show an alert dialog for video charges" am:
1451124f86 am:
2c773d3f96
am:
513044b23a
Change-Id: I94af04cf0fca1dbcb6bb66cddcd473df22790f5f
Bill Yi [Sat, 3 Mar 2018 07:17:16 +0000 (07:17 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev
am:
13ac18d299
Change-Id: I1e5b02cb9baad310f20bace33ce89c9668fbb3c0
Bill Yi [Sat, 3 Mar 2018 07:16:45 +0000 (07:16 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3
am:
bad5ea4cb1
Change-Id: I4ab3e06e6a678dfff13d3ab205a497375b711f72
Bill Yi [Sat, 3 Mar 2018 07:15:14 +0000 (07:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e
am:
dbea58fe4b -s ours
Change-Id: Ic72202f29a2a0101edfe89bce777b9a514296ebd
Bill Yi [Sat, 3 Mar 2018 07:11:41 +0000 (07:11 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours
am:
1f6fdce0b0 -s ours
Change-Id: I890e25939e0ca062b0be8c628089dbe455302fa2
Bill Yi [Sat, 3 Mar 2018 07:03:23 +0000 (07:03 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev
am:
b59324afa1
Change-Id: I34809b7775652fa23e145a73647b67292f41f10e
Bill Yi [Sat, 3 Mar 2018 07:01:41 +0000 (07:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad
am:
551e9b00ee -s ours
Change-Id: I482f064fca94761b7d01597177d7642629cf1553
Bill Yi [Sat, 3 Mar 2018 06:53:49 +0000 (06:53 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60 am:
fa863f597e -s ours am:
3d82e195f7 -s ours
am:
0f9e3adcda -s ours
Change-Id: I6adf3f79ffb510e4770e9e39dcb1b5fd55d304f3
Bill Yi [Sat, 3 Mar 2018 06:51:28 +0000 (06:51 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev
am:
3850cf69e3
Change-Id: Ic7be79fc9564f5c3fda0e6874be6eb1f7edbb143
Masaho Nishikawa [Sat, 3 Mar 2018 06:51:01 +0000 (06:51 +0000)]
Merge "Add config to show an alert dialog for video charges" am:
1451124f86
am:
2c773d3f96
Change-Id: If13158f209eda968f0fd50787679c957a3e5ea96
Bill Yi [Sat, 3 Mar 2018 06:49:53 +0000 (06:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724
am:
ac782db7b2 -s ours
Change-Id: Ia227614e9fb5abe03c01ff7475f5ce2f7f06ef61
Bill Yi [Sat, 3 Mar 2018 06:48:20 +0000 (06:48 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60 am:
fa863f597e -s ours
am:
3d82e195f7 -s ours
Change-Id: Ie89698d2c1a3974e4721d9bcc36bc8141c91bd13
Masaho Nishikawa [Sat, 3 Mar 2018 06:39:45 +0000 (06:39 +0000)]
Merge "Add config to show an alert dialog for video charges"
am:
1451124f86
Change-Id: Idf89d421f3716dc00af97877d19d81445dd63f44
Bill Yi [Sat, 3 Mar 2018 06:37:52 +0000 (06:37 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60
am:
fa863f597e -s ours
Change-Id: I65d675e10fff69c1b45b8bb07a1acb1bcff17dbd
TreeHugger Robot [Sat, 3 Mar 2018 05:43:12 +0000 (05:43 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532
Import translations. DO NOT MERGE
nharold [Sat, 3 Mar 2018 05:29:00 +0000 (05:29 +0000)]
Merge changes from topics "cdma-null-island", "cdma-signal-strength" am:
d5ba391425 am:
78f2c228d1
am:
062e101ffa
Change-Id: I4b31899f32b80062440b8d695fb668191924aee7
TreeHugger Robot [Sat, 3 Mar 2018 05:28:36 +0000 (05:28 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:27:27 +0000 (05:27 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6
Import translations. DO NOT MERGE
nharold [Sat, 3 Mar 2018 05:13:16 +0000 (05:13 +0000)]
Merge changes from topics "cdma-null-island", "cdma-signal-strength" am:
d5ba391425
am:
78f2c228d1
Change-Id: I4b821915c69aedd594747520186b2fb123d34b78
nharold [Sat, 3 Mar 2018 04:55:01 +0000 (04:55 +0000)]
Merge changes from topics "cdma-null-island", "cdma-signal-strength"
am:
d5ba391425
Change-Id: I1cd2ae9a3110f6c49cacfc3137c009a1e04227ea
TreeHugger Robot [Sat, 3 Mar 2018 04:53:46 +0000 (04:53 +0000)]
Merge "Removes unnecessary and incorrect instant app installer overrides"
TreeHugger Robot [Sat, 3 Mar 2018 04:47:22 +0000 (04:47 +0000)]
Merge "With build failure fix: Add stats logging in appDiedLocked."
yuanlu [Tue, 20 Feb 2018 22:28:13 +0000 (14:28 -0800)]
Add the flag for only alowing wifi on charger/network request option
Bug:
72828389
Test: atest
frameworks/base/core/tests/coretests/src/android/provider/SettingsBackupTest.java
Change-Id: I137e9cf4b9d5d9760bf05139bd6ead5973b13724
TreeHugger Robot [Sat, 3 Mar 2018 04:20:18 +0000 (04:20 +0000)]
Merge "Remove javadoc for return value"
Phil Weaver [Sat, 3 Mar 2018 03:35:34 +0000 (03:35 +0000)]
Merge "Change a11y shortcut default lockscreen behavior"
Treehugger Robot [Sat, 3 Mar 2018 03:30:19 +0000 (03:30 +0000)]
Merge "Add config to show an alert dialog for video charges"
Chenjie Yu [Sat, 3 Mar 2018 03:26:23 +0000 (03:26 +0000)]
Merge "Avoid double logging for app overlay"
TreeHugger Robot [Sat, 3 Mar 2018 03:14:57 +0000 (03:14 +0000)]
Merge "Added cmd to change number of visible datasets on Autofill dataset picker."
TreeHugger Robot [Sat, 3 Mar 2018 03:14:38 +0000 (03:14 +0000)]
Merge "MediaPlayer2: implement some API's"
nharold [Sat, 3 Mar 2018 03:14:22 +0000 (03:14 +0000)]
Merge changes from topics "cdma-null-island", "cdma-signal-strength"
* changes:
Set CDMA Location to Invalid if on Null Island
Fix Range-Checking in CellSignalStrengthCdma
Fix CDMA Range Checks for SignalStrength
Lucas Dupin [Sat, 3 Mar 2018 03:04:00 +0000 (19:04 -0800)]
Delete legacy code
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Change-Id: I81463eee0af4fa0dfb1e71d94c033e67ee3bd7df
nharold [Sat, 3 Mar 2018 02:57:41 +0000 (02:57 +0000)]
Merge "Expose Carrier Name Override CarrierConfig Values" am:
a60e42cc2d am:
f0b3b84a13
am:
5bc9756f8b
Change-Id: I747e769a5d278e90fa880d9d26011c6d010fd95d
TreeHugger Robot [Sat, 3 Mar 2018 02:53:16 +0000 (02:53 +0000)]
Merge "Release wakelock when binder died or exception occurs"
nharold [Sat, 3 Mar 2018 02:49:41 +0000 (02:49 +0000)]
Merge "Expose Carrier Name Override CarrierConfig Values" am:
a60e42cc2d
am:
f0b3b84a13
Change-Id: I074b386070118f8cac6efe3100ae88c378fd1a5e
nharold [Sat, 3 Mar 2018 02:33:59 +0000 (02:33 +0000)]
Merge "Expose Carrier Name Override CarrierConfig Values"
am:
a60e42cc2d
Change-Id: I38b27197171009958ed362a83a119b9de3af2adf
Patrick Baumann [Fri, 2 Mar 2018 18:21:28 +0000 (10:21 -0800)]
Removes unnecessary and incorrect instant app installer overrides
This change removes priority overrides made when an intersplit
resolve is being made. It also removes unnecessary overrides
that are already set on the mInstantAppInstallerInfo default
ResolveInfo.
Change-Id: Ifbd7eda2f7df2fb3927447e8e9b8c91f992efe26
Fixes:
72408536
Test: manual - ensured intersplit launches work as expected
Test: atest EphemeralTest passes
Yohei Yukawa [Sat, 3 Mar 2018 01:35:18 +0000 (17:35 -0800)]
Revert "Introduce InputConnection#reportLanguageHint()"
This reverts commit
e77386e8fbe01b7fbf1a04555d4088796d862f03 [1].
Reason for revert:
The protocol is not yet ready to be exposed and we are still unsure
what is the best approach.
[1]: Ie86edafd1ed68b58f702116f561fc448fdbb57a8
Bug:
7031513
Bug:
72522601
Fix:
74087970
Test: atest CtsInputMethodTestCases
Change-Id: Ia61dc9b3d5b116199382994430fb16ee804942b3
TreeHugger Robot [Sat, 3 Mar 2018 01:33:14 +0000 (01:33 +0000)]
Merge "Camera: Clarify AF_REGIONS behavior in capture_result"
Suprabh Shukla [Sat, 3 Mar 2018 01:32:21 +0000 (01:32 +0000)]
Merge "An api to query usage events for the caller"
Evan Rosky [Sat, 3 Mar 2018 01:07:46 +0000 (01:07 +0000)]
Merge "Enabled state shouldn't effect children."
TreeHugger Robot [Sat, 3 Mar 2018 00:54:31 +0000 (00:54 +0000)]
Merge "MediaSession2: Add caller to the callback methods"
Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:08 +0000 (00:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60
Change-Id: I634172b202c3401d476668f1173ab8fede42bc0b
Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:01 +0000 (00:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973
Change-Id: If3964293aa4ce9c51ecb353ef8c2ee817d14e460
Bill Yi [Sat, 3 Mar 2018 00:43:41 +0000 (16:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I741e6b188e72f4805e0eb34d27b93cdf89cfcad0
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 3 Mar 2018 00:36:28 +0000 (00:36 +0000)]
Merge "Prevent nav bar vibrations when overview proxy is connected (1/2)"
Cassie Han [Sat, 3 Mar 2018 00:31:34 +0000 (00:31 +0000)]
Merge "Expand use of 'Str' suffix in CellIdentity to 'String'" am:
d622eacb9e am:
3bcb6da703
am:
d210655d48
Change-Id: Ibc0862fb7ae1063cbee10415c4c21d7d4a835c51
Wei Jia [Fri, 2 Mar 2018 19:31:18 +0000 (11:31 -0800)]
MediaPlayer2: implement some API's
Test: MediaPlayer2 plays
Bug:
63934228
Change-Id: I10a4086db214b88f4a3eaea71fce81e8a994589a
Cassie Han [Sat, 3 Mar 2018 00:15:26 +0000 (00:15 +0000)]
Merge "Expand use of 'Str' suffix in CellIdentity to 'String'" am:
d622eacb9e
am:
3bcb6da703
Change-Id: If07c5a8d84933e8a353a77b39a1aa76f4a51a5bf
Android Build Merger (Role) [Sat, 3 Mar 2018 00:15:11 +0000 (00:15 +0000)]
Merge "Merge "Extend network request to query networks w/o capabilites" am:
d846adac83 am:
a3be78b5e7 am:
f5312f3538"
Pavel Maltsev [Sat, 3 Mar 2018 00:14:52 +0000 (00:14 +0000)]
Merge "Extend network request to query networks w/o capabilites" am:
d846adac83 am:
a3be78b5e7
am:
f5312f3538
Change-Id: I3bf776767be61577f1bca0d98d4aaf82a0e45336
TreeHugger Robot [Sat, 3 Mar 2018 00:14:22 +0000 (00:14 +0000)]
Merge "Report total latency instead of average for jobs last run"
TreeHugger Robot [Sat, 3 Mar 2018 00:13:40 +0000 (00:13 +0000)]
Merge "Creating new user correctly connects to the system OverviewProxy"
nharold [Sat, 3 Mar 2018 00:11:29 +0000 (00:11 +0000)]
Merge "Expose Carrier Name Override CarrierConfig Values"
Android Build Merger (Role) [Sat, 3 Mar 2018 00:04:44 +0000 (00:04 +0000)]
Merge "Merge "Add result code for eUICC card not found." am:
45277c7aca am:
32c5a97aec am:
5f01f42723 -s ours"
Holly Jiuyu Sun [Sat, 3 Mar 2018 00:03:55 +0000 (00:03 +0000)]
Merge "Add result code for eUICC card not found." am:
45277c7aca am:
32c5a97aec
am:
5f01f42723 -s ours
Change-Id: I81f7ba0bdea05e7cc6d82294fb13daec4f4401c1
OSDN Git Service
