OSDN Git Service
TreeHugger Robot [Mon, 5 Mar 2018 18:58:43 +0000 (18:58 +0000)]
Merge "Don't dereference a null pointer"
Adrian Roos [Mon, 5 Mar 2018 18:58:02 +0000 (18:58 +0000)]
DisplayCutout API: Make constructor public and adjust javadoc am:
9bbd9661c0
am:
573b1d11a6
Change-Id: Ib383e808d9a725894c17b2068fbd6cc83c128dd1
Jerry Zhang [Mon, 5 Mar 2018 18:45:00 +0000 (18:45 +0000)]
Merge "Update UsbHandlerTests"
Adrian Roos [Mon, 5 Mar 2018 18:34:50 +0000 (18:34 +0000)]
DisplayCutout API: Make constructor public and adjust javadoc
am:
9bbd9661c0
Change-Id: Ia8cff9659b65e03a4a03af7f28939fa1712a2cb2
Richard Ledley [Mon, 5 Mar 2018 18:09:58 +0000 (18:09 +0000)]
Merge "Add flag to control blocking Smart Replies for apps targeting an Android version below P."
TreeHugger Robot [Mon, 5 Mar 2018 18:05:19 +0000 (18:05 +0000)]
Merge "Display shortcut modifiers in menu"
Julia Reynolds [Mon, 5 Mar 2018 17:21:17 +0000 (17:21 +0000)]
Merge "Revert "Metric constant for dnd system toggle""
Julia Reynolds [Mon, 5 Mar 2018 17:20:09 +0000 (17:20 +0000)]
Revert "Metric constant for dnd system toggle"
This reverts commit
8c3342b3da78e5afa7a0133018247355c89ec424.
Change-Id: I768a53aec1fd7b9f6fbaa206e36d28617ae945c6
Lucas Dupin [Mon, 5 Mar 2018 17:05:08 +0000 (17:05 +0000)]
Merge "Tint keyguard icons"
TreeHugger Robot [Mon, 5 Mar 2018 16:24:34 +0000 (16:24 +0000)]
Merge "Metric constant for dnd system toggle"
TreeHugger Robot [Mon, 5 Mar 2018 15:40:28 +0000 (15:40 +0000)]
Merge "AAPT2: add flag for not compressing resources"
Erik Kline [Mon, 5 Mar 2018 15:23:18 +0000 (15:23 +0000)]
Merge "Fail if the interface is not available when starting" am:
b331b02da9 am:
a1f407d0f5
am:
f5af0cede5
Change-Id: Ief3c8e1652f69af0276fe35946ae1bf6e6b1b57e
Erik Kline [Mon, 5 Mar 2018 15:13:01 +0000 (15:13 +0000)]
Merge "Fail if the interface is not available when starting" am:
b331b02da9
am:
a1f407d0f5
Change-Id: Ifd27f5d908947cd7b4e1b8d54f9fa87e43ebb11b
Abodunrinwa Toki [Mon, 5 Mar 2018 15:07:40 +0000 (15:07 +0000)]
Merge "Merge textclassifier/logging/ into textclassifier/"
Erik Kline [Mon, 5 Mar 2018 15:05:08 +0000 (15:05 +0000)]
Merge "Fail if the interface is not available when starting"
am:
b331b02da9
Change-Id: If9a8b1bc88b7358919d67f0ebaf01115bd1af69e
TreeHugger Robot [Mon, 5 Mar 2018 14:50:07 +0000 (14:50 +0000)]
Merge "Tag @SystemApi to ambient brightness stats API"
Beverly [Mon, 5 Mar 2018 14:23:38 +0000 (09:23 -0500)]
Metric constant for dnd system toggle
Test: n/a
Bug:
73362490
Change-Id: I4a75823ac4acd854c3327a8c55b4b435fe0ba99e
Izabela Orlowska [Mon, 5 Mar 2018 14:19:43 +0000 (14:19 +0000)]
AAPT2: add flag for not compressing resources
Option and behaviour was already implemented, just missing the flag.
Test: N/A
Bug:
70118728
Change-Id: Ib1902cf547b4961395e6c6c99e02f32556981f48
Adrian Roos [Fri, 2 Mar 2018 13:31:37 +0000 (14:31 +0100)]
DisplayCutout API: Make constructor public and adjust javadoc
Change-Id: I093cf4f9ea60f00e187aeb4a548f3f5789d87fa1
Fixes:
73953880
Test: make update-api
(cherry picked from commit
d61db603fecefc72ce6454d34b24bab821337295)
TreeHugger Robot [Mon, 5 Mar 2018 13:34:24 +0000 (13:34 +0000)]
Merge "Don't whitelist all system image apps."
Adrian Roos [Mon, 5 Mar 2018 12:50:56 +0000 (12:50 +0000)]
Merge "DisplayCutout API: Make constructor public and adjust javadoc"
Erik Kline [Mon, 5 Mar 2018 12:39:28 +0000 (12:39 +0000)]
Merge "Fail if the interface is not available when starting"
Lorenzo Colitti [Mon, 5 Mar 2018 12:32:13 +0000 (12:32 +0000)]
Merge "Add DNS_TETHER to the list of UIDs in the framework." am:
0b8d55e633 am:
c64dc7c632
am:
28e229b85e
Change-Id: Ib3287ab358bd3793a7e957eaac22278ed70188ac
Lorenzo Colitti [Mon, 5 Mar 2018 12:23:35 +0000 (12:23 +0000)]
Merge "Add DNS_TETHER to the list of UIDs in the framework." am:
0b8d55e633
am:
c64dc7c632
Change-Id: Ie73be466fe9ace9a3ca8d8d7594ad41967186261
Erik Kline [Fri, 2 Mar 2018 07:51:13 +0000 (16:51 +0900)]
Fail if the interface is not available when starting
Addresses a long-standing TODO. Now, when calling IpClient's
startProvisioning(), the interface has to be available (i.e.
InterfaceParams#getByName() must return non-null).
Also:
- add a test
- refactor for testability
- delete some constructors no longer used
- properly handle passed-in null IpClient.Callback
- some more IpManager -> IpClient renaming
- permit recording metrics before starting a provisioning
attempt (logging immediate errors) without Log.wtf().
Test: as follows
- built
- flashed
- booted
- runtest frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
- runtest frameworks-net passes
- basic WiFi IpClient connections works fine
Bug:
62476366
Bug:
73487570
Change-Id: Ic83ad2a65637277dcb273feb27b2d1bb7a11eb2b
Lorenzo Colitti [Mon, 5 Mar 2018 10:11:44 +0000 (10:11 +0000)]
Merge "Add DNS_TETHER to the list of UIDs in the framework." am:
0b8d55e633 am:
c64dc7c632
am:
4390c3b515
Change-Id: If00509ce8c87fefa29cbe5e4bddeaf1702a55401
Annie Meng [Mon, 5 Mar 2018 10:04:08 +0000 (10:04 +0000)]
Merge "Validate restore of NetworkPolicy settings"
Lorenzo Colitti [Mon, 5 Mar 2018 09:59:20 +0000 (09:59 +0000)]
Merge "Add DNS_TETHER to the list of UIDs in the framework." am:
0b8d55e633
am:
c64dc7c632
Change-Id: I73a7bac120fb682dde44c3eb0b7587a727d2f343
Lorenzo Colitti [Mon, 5 Mar 2018 09:46:59 +0000 (09:46 +0000)]
Merge "Add DNS_TETHER to the list of UIDs in the framework."
am:
0b8d55e633
Change-Id: I2162a009968c1bcfbfc32a41f14c0e7cad81a8a7
Insun Kang [Mon, 5 Mar 2018 04:41:39 +0000 (13:41 +0900)]
VideoView2: Move MediaContolView2's hidden constant
Bug:
74173212
Test: VideoViewTest app
Change-Id: Ic91e0b0bfb910d555c1dbe77f028a017f2a18b79
Treehugger Robot [Mon, 5 Mar 2018 07:40:36 +0000 (07:40 +0000)]
Merge "Add DNS_TETHER to the list of UIDs in the framework."
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()""
Lucas Dupin [Sat, 3 Mar 2018 22:05:04 +0000 (14:05 -0800)]
Tint keyguard icons
Test: visual
Change-Id: I7915c4ad1cd4bcb852a7bdd68e9f57fda7f985c6
Fixes:
71599427
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"
OSDN Git Service
