OSDN Git Service
TreeHugger Robot [Tue, 2 May 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Color extraction on scrims"
Jean-Michel Trivi [Tue, 2 May 2017 18:02:25 +0000 (18:02 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev am:
dce4dfc6fc
am:
7f2cc46a0f
Change-Id: I7e6c6099690f514d4f4797a13989bdc61ad390f1
Dianne Hackborn [Tue, 2 May 2017 18:00:22 +0000 (18:00 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev am:
72c0ab518a
am:
c812cf27ab
Change-Id: I7a7b4b17a4eeeeda7619e6fa9702ef059af7d76f
Jean-Michel Trivi [Tue, 2 May 2017 17:56:07 +0000 (17:56 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev
am:
dce4dfc6fc
Change-Id: Ic42056d370ecd0a08574dd575856ff15813bc8c0
Jean-Michel Trivi [Tue, 2 May 2017 17:52:32 +0000 (17:52 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev
Dianne Hackborn [Tue, 2 May 2017 17:51:20 +0000 (17:51 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
am:
72c0ab518a
Change-Id: I1987075221d0d5fa16483e6a41003b0394291d10
Dianne Hackborn [Tue, 2 May 2017 17:45:46 +0000 (17:45 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
Seigo Nonaka [Tue, 2 May 2017 17:44:46 +0000 (17:44 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev am:
b3e92234fa
am:
159f549c8f
Change-Id: Ief83bf6522468ab40d8dd9c3a68ab72892952ea4
TreeHugger Robot [Tue, 2 May 2017 17:41:50 +0000 (17:41 +0000)]
Merge "Make IMidiDeviceServer.setDeviceInfo method oneway"
Amith Yamasani [Tue, 2 May 2017 17:37:13 +0000 (17:37 +0000)]
Merge "Clear calling uid before changing whitelist" into oc-dev am:
97e3db9aee
am:
d74a51bd62
Change-Id: I2da254531ea4d5e24828501cadb2b37c28ce8719
Jorim Jaggi [Tue, 2 May 2017 17:34:18 +0000 (17:34 +0000)]
Merge "Fix app transition logging when switching quickly" into oc-dev am:
4cbad7fac1
am:
86c8ba41f3
Change-Id: I6c0355c4d90e127e809620d857ce138a077c6840
Seigo Nonaka [Tue, 2 May 2017 17:32:04 +0000 (17:32 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev
am:
b3e92234fa
Change-Id: If06bf0e49030839f1b4f95c0a776e4aab1ed94d8
Amith Yamasani [Tue, 2 May 2017 17:29:39 +0000 (17:29 +0000)]
Merge "Clear calling uid before changing whitelist" into oc-dev
am:
97e3db9aee
Change-Id: Icc858733afb22720a9adf1a1c4e85ba47cf03e2d
Android Build Merger (Role) [Tue, 2 May 2017 17:26:39 +0000 (17:26 +0000)]
Merge "Merge "Don't crash during app uninstall." into oc-dev am:
661b6badef am:
b9fcccb0c0"
Daniel Nishi [Tue, 2 May 2017 17:25:47 +0000 (17:25 +0000)]
Merge "Don't crash during app uninstall." into oc-dev am:
661b6badef
am:
b9fcccb0c0
Change-Id: I91401f5692892519da476fe75f60afc632cc87e0
TreeHugger Robot [Tue, 2 May 2017 17:22:58 +0000 (17:22 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev
Jorim Jaggi [Tue, 2 May 2017 17:21:24 +0000 (17:21 +0000)]
Merge "Fix app transition logging when switching quickly" into oc-dev
am:
4cbad7fac1
Change-Id: I2b759dbcc3f010172c843e84835ccb68182b5efd
Amith Yamasani [Tue, 2 May 2017 17:20:31 +0000 (17:20 +0000)]
Merge "Clear calling uid before changing whitelist" into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:17:47 +0000 (17:17 +0000)]
Merge "Don't crash during app uninstall." into oc-dev am:
661b6badef
am:
b9fcccb0c0
Change-Id: I96165dece81c0d04cee6e8330216f63100a5cbd3
Bill Yi [Tue, 2 May 2017 17:15:18 +0000 (17:15 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 2 May 2017 17:14:57 +0000 (17:14 +0000)]
Merge "Fix app transition logging when switching quickly" into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Don't crash during app uninstall." into oc-dev
am:
661b6badef
Change-Id: Iceab4bdd88e348c4bd4019ee1fb6c7c8b3f5baf1
Daniel Nishi [Tue, 2 May 2017 17:03:51 +0000 (17:03 +0000)]
Merge "Don't crash during app uninstall." into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 16:40:12 +0000 (16:40 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev am:
0fe5a2d5b3
am:
1b048b299c
Change-Id: I1793a8ab5bf98bf4e0c558df38238fbbfc6560c9
Abodunrinwa Toki [Tue, 2 May 2017 16:31:50 +0000 (16:31 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
am:
0fe5a2d5b3
Change-Id: I72d5fdd4351860bc02289abde6b1c36e13407e69
Erik Wolsheimer [Tue, 2 May 2017 16:30:43 +0000 (16:30 +0000)]
Merge "Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev am:
550e1c9a6b" into oc-dev-plus-aosp
am:
17d766c917
Change-Id: Ie501008a3696b02e836cf92c0671b3c160b1ef24
Jiwen Cai [Tue, 2 May 2017 16:25:03 +0000 (16:25 +0000)]
Merge "Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev am:
9967a4d3af" into oc-dev-plus-aosp
am:
edae7a8e1c
Change-Id: I16a9bc71853eef3334fec3ff7939859818daae13
TreeHugger Robot [Tue, 2 May 2017 16:21:10 +0000 (16:21 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
Erik Wolsheimer [Tue, 2 May 2017 16:20:11 +0000 (16:20 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 am:
ab4617dd92 -s ours
am:
b1d8568349
Change-Id: Ia698bc1244fffbd7adac7aaf85e320564a2852e5
The Android Open Source Project [Tue, 2 May 2017 16:17:25 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7f43068aa5 -s ours
am:
05713dc164 -s ours
Change-Id: Ic2b16fc7ce66575225c6247f2c6d2df90ceeb5f5
The Android Open Source Project [Tue, 2 May 2017 16:15:44 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
71ffd8bc87 -s ours
am:
3db706109b -s ours
Change-Id: I40daf0ddcc9e14070a6e585fe932632e08752cce
Android Build Merger (Role) [Tue, 2 May 2017 16:10:47 +0000 (16:10 +0000)]
Merge "Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev am:
550e1c9a6b" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 2 May 2017 16:10:00 +0000 (16:10 +0000)]
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev
am:
550e1c9a6b
Change-Id: Ie3ec9c7b8aee293f79cccde97b197c8c77d63281
Android Build Merger (Role) [Tue, 2 May 2017 16:09:21 +0000 (16:09 +0000)]
Merge "Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev am:
9967a4d3af" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 2 May 2017 16:07:10 +0000 (16:07 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286
am:
ab4617dd92 -s ours
Change-Id: I4d65ed8df4f31b6e7aff05a554207a6a3d093614
Jiwen Cai [Tue, 2 May 2017 16:04:26 +0000 (16:04 +0000)]
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
am:
9967a4d3af
Change-Id: If2ec26782f82e0f22deb7d952b79436e30a91867
Android Build Merger (Role) [Tue, 2 May 2017 16:00:52 +0000 (16:00 +0000)]
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev
Erik Wolsheimer [Tue, 2 May 2017 15:59:55 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759
am:
a399705286
Change-Id: I31b67a7bb496051a9062d4770a96119251a1b434
Erik Wolsheimer [Tue, 2 May 2017 15:59:43 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759
am:
a399705286 -s ours
Change-Id: I654fc19afef7f11d894590d287cde3650b8252af
Jiwen Cai [Tue, 2 May 2017 15:59:21 +0000 (15:59 +0000)]
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
Vladislav Kaznacheev [Tue, 2 May 2017 15:58:35 +0000 (15:58 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev am:
883af0766a
am:
1ae2909045
Change-Id: I178f0af13e2df05acf0918e492a9b8a44d1107e6
The Android Open Source Project [Tue, 2 May 2017 15:56:20 +0000 (15:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7f43068aa5 -s ours
Change-Id: Ib3bf970248fec4410e2a4de47825c511b34fff6e
Tony Mak [Tue, 2 May 2017 15:55:21 +0000 (15:55 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev am:
91c6e44e9e
am:
1fe0c5cae8
Change-Id: I2fb7103267fbcf76ede3f168b4d7b4892c501943
Erik Wolsheimer [Tue, 2 May 2017 15:54:40 +0000 (15:54 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
am:
a686345759
Change-Id: I0598c6210dbf0d0447c31112419a2fee829037be
The Android Open Source Project [Tue, 2 May 2017 15:54:35 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
71ffd8bc87 -s ours
Change-Id: Iff4a81cc730f7d35d95da27937df2d171b3379d9
TreeHugger Robot [Tue, 2 May 2017 15:49:24 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jorim Jaggi [Tue, 2 May 2017 15:49:06 +0000 (15:49 +0000)]
Merge "Split out whether frame callback and tick is scheduled" into oc-dev am:
756efea145
am:
62c1e21a25
Change-Id: I5e6d697a43327fc583f0248201ab4c7d2bd277cd
Vladislav Kaznacheev [Tue, 2 May 2017 15:48:11 +0000 (15:48 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev
am:
883af0766a
Change-Id: Ib2799189f34cb8fc2baeb19a6a4a005eb13b64d1
TreeHugger Robot [Tue, 2 May 2017 15:47:33 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Wale Ogunwale [Tue, 2 May 2017 15:47:10 +0000 (15:47 +0000)]
Merge "Don't send configuration that app doesn't support to it." into oc-dev am:
22c1275c89
am:
f528efd2fc
Change-Id: I5ad92b83b66996101ec7c8144d5924ff2bfd08c4
Tony Mak [Tue, 2 May 2017 15:46:13 +0000 (15:46 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
am:
91c6e44e9e
Change-Id: I360c03f15bf8a84d58100e371ed5528db6975f4d
Oleksiy Avramchenko [Tue, 2 May 2017 15:45:25 +0000 (15:45 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704 am:
96a8556990 am:
db877fa31c
am:
f12993a715
Change-Id: I3b4ef0bd22da42883c4ae76640343ec4484e7e2d
TreeHugger Robot [Tue, 2 May 2017 15:40:37 +0000 (15:40 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 15:38:44 +0000 (15:38 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
Android Build Merger (Role) [Tue, 2 May 2017 15:32:10 +0000 (15:32 +0000)]
TreeHugger Robot [Tue, 2 May 2017 15:31:16 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Narayan Kamath [Tue, 2 May 2017 15:31:06 +0000 (15:31 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd am:
f06800c3ff am:
58508dfd6e
am:
2c9fc6f6b7
Change-Id: I5af6e30af6478d070767fee87bc185f10bba2fa3
TreeHugger Robot [Tue, 2 May 2017 15:27:42 +0000 (15:27 +0000)]
Merge "selectBackupTransportAsync should report failure when backup is disabled"
Jorim Jaggi [Tue, 2 May 2017 15:05:12 +0000 (15:05 +0000)]
Merge "Split out whether frame callback and tick is scheduled" into oc-dev
am:
756efea145
Change-Id: I73a1585ac7e287afcf2f0d15d9ccedc5627deed0
TreeHugger Robot [Tue, 2 May 2017 15:02:24 +0000 (15:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Jorim Jaggi [Fri, 28 Apr 2017 17:06:24 +0000 (19:06 +0200)]
Fix app transition logging when switching quickly
If an app was set to invisible before the transition started,
which happens when quickly open an app and then closing again
before the animation is starting (only possible if starting
window is slightly delayed), we never receive onWindowsDrawn so we
need to cancel the transition in this case.
Also fixes an issue where the wrong activity was reported as
starting to us in case reusedActivity != null but we'll only reuse
it for the task and not the actual activity.
Test: Open Calendar, press home immediately, open another app, make
sure all logged events and times are correct.
Fixes:
37538546
Change-Id: I5819bd97964ab2dd5cb40b2f4e3bc5a9ac348152
TreeHugger Robot [Tue, 2 May 2017 14:58:15 +0000 (14:58 +0000)]
Merge "Split out whether frame callback and tick is scheduled" into oc-dev
Jerome Gaillard [Tue, 2 May 2017 14:26:18 +0000 (14:26 +0000)]
Merge "Ignore density in AdaptiveIconDrawable"
Jerome Gaillard [Tue, 2 May 2017 14:25:26 +0000 (14:25 +0000)]
Merge "Update AccessibilityManager in layoutlib following I65db0252"
Abodunrinwa Toki [Fri, 28 Apr 2017 21:14:13 +0000 (22:14 +0100)]
Add "Paste as plain text" in TextView's toolbar.
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug:
36179795
Change-Id: Iee0502678adcfb9de58c107b9247a528718b2c40
Wale Ogunwale [Tue, 2 May 2017 14:06:01 +0000 (14:06 +0000)]
Merge "Don't send configuration that app doesn't support to it." into oc-dev
am:
22c1275c89
Change-Id: Ib7b3b945c476fae59800421c6075397d8bb6352c
TreeHugger Robot [Tue, 2 May 2017 13:58:55 +0000 (13:58 +0000)]
Merge "Don't send configuration that app doesn't support to it." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 13:55:16 +0000 (13:55 +0000)]
Merge "CameraMetadataNative: Fix FD leak in dump."
Tony Mak [Tue, 2 May 2017 12:50:18 +0000 (13:50 +0100)]
Add back the throwIfParentInstance checking in getAffiliationIds
Fix:
37887947
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ParentProfileTest#testParentProfileApiDisabled
Change-Id: I05944c7a2447998d3ea948195fb25b09ab9735fc
Tony Mak [Tue, 2 May 2017 13:15:10 +0000 (14:15 +0100)]
selectBackupTransportAsync should report failure when backup is disabled
Fix:
37304539
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java
Test: setup device owner, then set up profile.
Ensure tapping Settings->Google->Work->Security -> Verify app
is working
Change-Id: I393308857ea6082dca167e3e417b946615a83c20
Oleksiy Avramchenko [Tue, 2 May 2017 12:58:12 +0000 (12:58 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704 am:
96a8556990
am:
db877fa31c
Change-Id: Ib03f7ded6bb232193eec32a4f566244d3caa94b5
Oleksiy Avramchenko [Tue, 2 May 2017 12:53:33 +0000 (12:53 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704
am:
96a8556990
Change-Id: I5caed909e1ba67931f05b0b44a0ff0fd62b131d0
Oleksiy Avramchenko [Tue, 2 May 2017 12:48:34 +0000 (12:48 +0000)]
Merge "Force a light to be set for the first time"
am:
e6ad7a6704
Change-Id: Icc13b24debc55f4c107dea61123e468a79828f11
Treehugger Robot [Tue, 2 May 2017 12:42:12 +0000 (12:42 +0000)]
Merge "Force a light to be set for the first time"
Jorim Jaggi [Fri, 28 Apr 2017 14:39:19 +0000 (16:39 +0200)]
Split out whether frame callback and tick is scheduled
Since the animation/gesture for screen zoom is running at
vsync-app, calling WMS.scheduleAnimation will schedule only
at the next frame. However, in the next frame, only the frame
callback is handled but not the tick yet, however
mAnimationScheduled was still true. Thus, the request to schedule
another frame callback is ignored, and then the things get
updated only every 2nd frame.
Fix this by splitting the information whether the frame callback
is scheduled or the actual tick.
Test: Use accessibility screen zoom, make sure gestures are
smooth.
Fixes:
37476440
Change-Id: I2301fab5bf3f3b896d4aa131fb041b89572fa3a7
Narayan Kamath [Tue, 2 May 2017 10:26:33 +0000 (10:26 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd am:
f06800c3ff
am:
58508dfd6e
Change-Id: Ia3f2a9ac5843a32da7c730a172af248abebd7b00
Narayan Kamath [Tue, 2 May 2017 10:19:30 +0000 (10:19 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd
am:
f06800c3ff
Change-Id: I3c734734bf553e0b4695a897de113d9031f18abd
Narayan Kamath [Tue, 2 May 2017 10:13:48 +0000 (10:13 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7."
am:
194f8471fd
Change-Id: Ie4fbcc4defee14c91cd3b84adf4f3ae5f47add3f
Narayan Kamath [Tue, 2 May 2017 10:06:48 +0000 (10:06 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7."
TreeHugger Robot [Tue, 2 May 2017 10:00:22 +0000 (10:00 +0000)]
Merge "Add a time-out for connecting to SystemServer, and WebView, zygotes."
Hugo Benichi [Tue, 2 May 2017 09:09:55 +0000 (09:09 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c am:
60182dbe4e am:
27b0eebb4d
am:
807c525de2
Change-Id: I2bbd97293d2887824b857d7e20fdc14d574bc097
Hugo Benichi [Tue, 2 May 2017 09:04:59 +0000 (09:04 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c am:
60182dbe4e
am:
27b0eebb4d
Change-Id: I46acfd104ac3457126c3ccef5041788e4146321c
Hugo Benichi [Tue, 2 May 2017 08:59:22 +0000 (08:59 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c
am:
60182dbe4e
Change-Id: I341cbbfd36b4e849651505c187053115833ca4b0
Hugo Benichi [Tue, 2 May 2017 08:54:46 +0000 (08:54 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
am:
3e21b1745c
Change-Id: I0fd1d8e6ea3264a96b144c6701200f7b0be5f9c4
Treehugger Robot [Tue, 2 May 2017 08:44:27 +0000 (08:44 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
Oleksiy Avramchenko [Tue, 25 Apr 2017 10:30:49 +0000 (12:30 +0200)]
Force a light to be set for the first time
The check in LightImpl::setLightLocked skips HAL call if light
parameters aren't changed. During initialization these parameters
are zeroed, thus it's not possible to turn the light off at the
startup.
As an example this fixes the issue with "stuck" battery light
in the following scenario:
1. Device has secure start-up option set (either pin or pattern).
2. Charger is connected at the startup and battery light shows the
charging state on pin or pattern prompt.
3. Device is unlocked and charger disconnected after some time,
e.g. after com.android.server.lights.LightsService restarted.
4. The battery light is not off and stuck in the previous state
until charger is connected / disconnected again.
Bug:
37662368
Test: manual - follow the above step-by-step
Change-Id: I45470e945fe4d26d37a5641dfff3311968f51ee4
Chulwoo Lee [Tue, 2 May 2017 07:08:41 +0000 (07:08 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev am:
90074d1ec8
am:
6af43e5d6f
Change-Id: I0b791a12cdee5dc5ce4bdc1c27eecd8b0166fc15
The Android Open Source Project [Tue, 2 May 2017 07:05:25 +0000 (00:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia533546d474a51fa42205fa4ebf7ec122d17fa38
Auto-generated-cl: translation import
Chulwoo Lee [Tue, 2 May 2017 07:02:35 +0000 (07:02 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev
am:
90074d1ec8
Change-Id: I18545582572c60956548af8c732b7e6543f00d76
TreeHugger Robot [Tue, 2 May 2017 06:56:48 +0000 (06:56 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev
Hugo Benichi [Tue, 2 May 2017 06:56:15 +0000 (06:56 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am:
b0e408450c am:
bc57faa1ac am:
9a3e69d9b6
am:
783019d2ff
Change-Id: I88461d537e43fb086366dcc681b5ef2c2bdcdc2f
The Android Open Source Project [Tue, 2 May 2017 06:55:22 +0000 (23:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic4f27d9d16d255a2f13cdf5d1652e593215e43c2
Auto-generated-cl: translation import
Hugo Benichi [Tue, 2 May 2017 06:49:52 +0000 (06:49 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am:
b0e408450c am:
bc57faa1ac
am:
9a3e69d9b6
Change-Id: Ideabb1c929ddd4307e66831cddb20e2feac2c6d9
Hugo Benichi [Tue, 2 May 2017 06:42:44 +0000 (06:42 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am:
b0e408450c
am:
bc57faa1ac
Change-Id: I55a7a1a33cfd30a5c8d5ede67f6a1c602a840e6a
Hugo Benichi [Tue, 2 May 2017 06:35:11 +0000 (06:35 +0000)]
Merge "NsdManager: unit test coverage for servive registration"
am:
b0e408450c
Change-Id: I0b47ad5a1ccee4a2efb169d717b512a46ad4ecc2
Treehugger Robot [Tue, 2 May 2017 06:27:08 +0000 (06:27 +0000)]
Merge "NsdManager: unit test coverage for servive registration"
Hugo Benichi [Fri, 28 Apr 2017 04:29:21 +0000 (13:29 +0900)]
NsdManager: add test coverage for discoverServices()
Test: added new tests
Bug:
37013369,
33298084
Change-Id: If6c1113ee1bd4690db90abd5a61c3e229c827aec
Seigo Nonaka [Mon, 1 May 2017 21:24:32 +0000 (14:24 -0700)]
Fix NPE happens if no source was specified to font element.
This also fixes unexpected fallback to the old implemntation by calling
allowUnsupportedFont() which is only for backward compatibility.
This CL also remove getResourceId() method. Nobody uses this method.
Bug:
37865521
Bug:
37844248
Test: am instrument -w -e class android.content.res.cts.ResourcesTest\
android.content.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I987448add728c53c916f24a2ea8f337be417248f
Lorenzo Colitti [Tue, 2 May 2017 04:51:08 +0000 (04:51 +0000)]
Merge "Add a method to start the captive portal login app." into oc-dev am:
5555b1e3d1
am:
6b7553bc21
Change-Id: I65e9632d28e63ba3278a5f396554b7be302e20d1
Lorenzo Colitti [Tue, 2 May 2017 04:44:31 +0000 (04:44 +0000)]
Merge "Add a method to start the captive portal login app." into oc-dev
am:
5555b1e3d1
Change-Id: Ic7c14bd3dfd07f97c04901f043ed1cd3b1eee6e4
OSDN Git Service
