OSDN Git Service
Hugo Benichi [Mon, 5 Jun 2017 17:36:13 +0000 (17:36 +0000)]
Fix captive portal login ssl error overflow am:
c991275325 -s ours
am:
1282acdc93
Change-Id: Ifeb5739cf8e6df674978f94bb947fbcabe617b51
Erik Kline [Mon, 5 Jun 2017 17:34:58 +0000 (17:34 +0000)]
Merge "Minor upstream selection refactoring" am:
12fe022fbd am:
2cb58deb7b am:
3e402328d5
am:
ea7a46cee6
Change-Id: I2f0ed56e76f974e6ef79d3d6ae21524dbc80daf2
Hugo Benichi [Mon, 5 Jun 2017 17:33:39 +0000 (17:33 +0000)]
Merge "Fix captive portal login ssl error overflow" am:
42409f9776 am:
a89aad8408 am:
f3f7cd007a
am:
7412716459
Change-Id: Icdde90e1cc22c481495b2bcf859074ba1a188244
Bill Yi [Mon, 5 Jun 2017 17:32:20 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
5228e5d0cb -s ours
am:
fb5fdf1012 -s ours
Change-Id: Ib99c9f8b11e9cb0c2b8c8502e24b2f80ff23686c
Bill Yi [Mon, 5 Jun 2017 17:31:00 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
247911d184 -s ours
am:
f6ee9682f8 -s ours
Change-Id: I6b30b9b74c217f07949bd6e5c88bab860321995a
Tony Mantler [Mon, 5 Jun 2017 17:27:56 +0000 (17:27 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev am:
5cb5bbdae0
am:
804222061a -s ours
Change-Id: I646474a798fba26895dc69f47e5ccd73bdf12185
Bill Yi [Mon, 5 Jun 2017 17:25:23 +0000 (17:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f31a663316 -s ours
am:
77e6256bb9 -s ours
Change-Id: I6dc15e5bcc098df88d3aec57974b346656e15679
Android Build Merger (Role) [Mon, 5 Jun 2017 17:20:43 +0000 (17:20 +0000)]
Merge "Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev am:
c3504d4f33 am:
d288ca8d2d"
Winson Chung [Mon, 5 Jun 2017 17:19:14 +0000 (17:19 +0000)]
Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev am:
c3504d4f33
am:
d288ca8d2d
Change-Id: I80aed8fd0d0a8573bd4b6cec7bf8c14878a0935c
Lei Yu [Mon, 5 Jun 2017 17:19:04 +0000 (17:19 +0000)]
Merge "Update strings related to BatteryInfo"
TreeHugger Robot [Mon, 5 Jun 2017 16:40:52 +0000 (16:40 +0000)]
Merge "Add support for vibrator 1.1 HAL and TICK effect."
TreeHugger Robot [Mon, 5 Jun 2017 16:38:35 +0000 (16:38 +0000)]
Merge "Remove QS Gutter"
Alex Kulesza [Mon, 5 Jun 2017 15:12:51 +0000 (15:12 +0000)]
Merge "Remove BatteryDetail from BatterySaverTile"
Jason Monk [Fri, 2 Jun 2017 16:50:24 +0000 (12:50 -0400)]
Remove QS Gutter
Test: manual
Change-Id: I10be3dfc9b9745f25b8fec3ef1f5d812441890ad
Fixes:
62234983
Paul Duffin [Fri, 19 May 2017 08:05:54 +0000 (09:05 +0100)]
Added android.test.mock and android.test.mock.sdk targets
The android.test.mock will be used for any targets that require
android.test.mock classes but which do not already depend on the
sdk. It is also the library that will be added to the classpath
at runtime when an app has the following in their manifest.
<uses-library android:name="android.test.mock"/>
The android.test.mock.sdk will be used by targets that require
android.test.mock classes and which build against the SDK. It
contains stub classes (like android.jar). It is also the library
that will be copied into the optional directory of the SDK.
Bug:
30188076
Test: make checkbuild
Change-Id: Ia3fcd47c644b8e5a573f891571a7b3772eac63f9
Narayan Kamath [Mon, 5 Jun 2017 08:43:03 +0000 (08:43 +0000)]
Merge "ActivityManagerService: Add support for new stack dumping scheme."
Hugo Benichi [Mon, 5 Jun 2017 07:47:32 +0000 (07:47 +0000)]
Fix captive portal login ssl error overflow
am:
c991275325 -s ours
Change-Id: I258a2e8656ae8ab23855f80057a5e2733959660b
Erik Kline [Mon, 5 Jun 2017 04:48:22 +0000 (04:48 +0000)]
Merge "Minor upstream selection refactoring" am:
12fe022fbd am:
2cb58deb7b
am:
3e402328d5
Change-Id: I6ee263014ad42f7e195cd5d1806916a5c3ef18e0
Erik Kline [Mon, 5 Jun 2017 04:38:51 +0000 (04:38 +0000)]
Merge "Minor upstream selection refactoring" am:
12fe022fbd
am:
2cb58deb7b
Change-Id: I9868806741e17c23e8c9ed34e753062733af190e
Hugo Benichi [Mon, 5 Jun 2017 04:31:23 +0000 (04:31 +0000)]
Merge "New Metrics constants for captive portal related UI"
Erik Kline [Mon, 5 Jun 2017 04:28:16 +0000 (04:28 +0000)]
Merge "Minor upstream selection refactoring"
am:
12fe022fbd
Change-Id: I1984cf520c04cdc2751dca3d6029793a257a1592
Treehugger Robot [Mon, 5 Jun 2017 04:19:28 +0000 (04:19 +0000)]
Merge "Minor upstream selection refactoring"
Hugo Benichi [Mon, 5 Jun 2017 04:18:53 +0000 (04:18 +0000)]
Merge "Fix captive portal login ssl error overflow" am:
42409f9776 am:
a89aad8408
am:
f3f7cd007a
Change-Id: I1f162b171d750fed8f17ff96c6e684efa8f3cd3f
Hugo Benichi [Mon, 5 Jun 2017 04:09:22 +0000 (04:09 +0000)]
Merge "Fix captive portal login ssl error overflow" am:
42409f9776
am:
a89aad8408
Change-Id: Id56f6bddf188b80b5e371e78ea8a45df63742414
Hugo Benichi [Mon, 5 Jun 2017 03:59:14 +0000 (03:59 +0000)]
Merge "Fix captive portal login ssl error overflow"
am:
42409f9776
Change-Id: I71a035066c522d6e96a43dea32f07594861bdbed
Hugo Benichi [Fri, 2 Jun 2017 01:12:09 +0000 (10:12 +0900)]
Fix captive portal login ssl error overflow
This patch fixes the built-in html page shown in the captive portal
login activity when there is an ssl error. The page is now scaled
correctly with respect to the device screen, and text wraps as
expected.
This patch also cleanups the hardcoded page by:
- formatting it for better reading,
- inlining the "px" css rules,
- using string concatenation instead of format for including the
localized text.
Bug:
62269512
Bug:
36532213
Test: manually triggered the activity to load the error page
Merged-In: I9d037222798bd9d4c1736923afb71e3e14c68bcc
(cherry pick from commit
60d5f46d89038a6a46c38ac0e57d0762a67732cb)
Change-Id: I5cb6e53f5af9dc4b93be8da1d9b6e0e8958e561f
Treehugger Robot [Mon, 5 Jun 2017 03:47:58 +0000 (03:47 +0000)]
Merge "Fix captive portal login ssl error overflow"
Erik Kline [Sun, 4 Jun 2017 02:36:01 +0000 (11:36 +0900)]
Minor upstream selection refactoring
Specifically:
- relocated "tryCell" handling
- minor logging change
- remove unneeded checkExpectedThread()
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I2f5428206503fd222b959e695c26326df53038f1
Hugo Benichi [Fri, 2 Jun 2017 01:12:09 +0000 (10:12 +0900)]
Fix captive portal login ssl error overflow
This patch fixes the built-in html page shown in the captive portal
login activity when there is an ssl error. The page is now scaled
correctly with respect to the device screen, and text wraps as
expected.
This patch also cleanups the hardcoded page by:
- formatting it for better reading,
- inlining the "px" css rules,
- using string concatenation instead of format for including the
localized text.
Bug:
62269512
Bug:
36532213
Test: manually triggered the activity to load the error page
Change-Id: I9d037222798bd9d4c1736923afb71e3e14c68bcc
Bill Yi [Sat, 3 Jun 2017 21:56:45 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
5228e5d0cb -s ours
Change-Id: Iba14cc0d0ef8dfb745b946d9504e261a6ab2f519
Bill Yi [Sat, 3 Jun 2017 21:51:51 +0000 (21:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
247911d184 -s ours
Change-Id: I4137b8071cc8134687cfaac3ab38d9f86125edb0
TreeHugger Robot [Sat, 3 Jun 2017 21:49:40 +0000 (21:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Tony Mantler [Sat, 3 Jun 2017 21:49:13 +0000 (21:49 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
am:
5cb5bbdae0
Change-Id: Ibfc27da75570401ba58a722fe46a7c58689a38d6
TreeHugger Robot [Sat, 3 Jun 2017 21:43:40 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 21:41:53 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 3 Jun 2017 21:41:24 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f31a663316 -s ours
Change-Id: I349a8b805ab94428e62bcc5080771a1b675e0bcc
TreeHugger Robot [Sat, 3 Jun 2017 21:40:58 +0000 (21:40 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 21:38:15 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 3 Jun 2017 21:32:58 +0000 (21:32 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 3 Jun 2017 21:31:40 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 21:23:07 +0000 (21:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Winson Chung [Sat, 3 Jun 2017 20:50:49 +0000 (20:50 +0000)]
Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev
am:
c3504d4f33
Change-Id: I07ff4ce93022c681b327b1dbb8a03893471b752e
TreeHugger Robot [Sat, 3 Jun 2017 20:41:10 +0000 (20:41 +0000)]
Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev
Bill Yi [Sat, 3 Jun 2017 17:05:08 +0000 (10:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a02b8e0c5b650bb2194c2e510db310060f2cab9
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 16:49:02 +0000 (09:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia0ef25bc2553f5c933e0b5573c5e2b606d932d39
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 12:17:02 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I171ceb765374ef904105e7a8ed7fbf01337be265
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 12:10:59 +0000 (05:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id173840acdf93c20e287471bb51ea2127df0469e
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 11:47:33 +0000 (04:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8468ac3d22f323183b2343888d8f0fe88451a22a
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 10:14:54 +0000 (03:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f16f808f5ab850fb3bb459ea63548471d44eeca
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 09:39:28 +0000 (02:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7a87753641973d604a36c283cb2484a6e5fceb2
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 3 Jun 2017 04:29:26 +0000 (04:29 +0000)]
Merge "Move strings to SettingsLib so TV can use them"
Chong Zhang [Sat, 3 Jun 2017 02:33:06 +0000 (02:33 +0000)]
Merge "Add media.codec to native stack dump list" into oc-dev am:
0082de03e5
am:
46053192d9
Change-Id: Ib15d81464dd81ef916c0945e1f6d237bf8c6ecda
Chong Zhang [Sat, 3 Jun 2017 02:25:44 +0000 (02:25 +0000)]
Merge "Add media.codec to native stack dump list" into oc-dev
am:
0082de03e5
Change-Id: I39887ee66b1c09a2ab477978681866f407c72b81
TreeHugger Robot [Sat, 3 Jun 2017 02:20:17 +0000 (02:20 +0000)]
Merge "Add media.codec to native stack dump list" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 01:55:49 +0000 (01:55 +0000)]
Merge "AAPT2: Allow undefined resources (placeholders)"
Winson Chung [Sat, 3 Jun 2017 01:52:44 +0000 (01:52 +0000)]
Merge "Handling cases with a null bitmap." into oc-dev am:
1eddb0cb2e
am:
d1a3b24b62
Change-Id: I1f5b291a0a0b4912df5996ff409eef8ec458d937
Winson Chung [Sat, 3 Jun 2017 01:44:41 +0000 (01:44 +0000)]
Merge "Handling cases with a null bitmap." into oc-dev
am:
1eddb0cb2e
Change-Id: Iecc01386dc5a236a85d34ff0048ec2b6fd50bc6d
TreeHugger Robot [Sat, 3 Jun 2017 01:37:49 +0000 (01:37 +0000)]
Merge "Handling cases with a null bitmap." into oc-dev
John Reck [Sat, 3 Jun 2017 01:19:57 +0000 (01:19 +0000)]
Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev am:
a2f747c57c
am:
427eb020a6
Change-Id: I567e04d71350c8176a9b39f776fc3ba356c253fa
John Reck [Sat, 3 Jun 2017 01:11:08 +0000 (01:11 +0000)]
Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev
am:
a2f747c57c
Change-Id: I86355ce39a012f9db3a688198bebeadd7bde15c6
TreeHugger Robot [Sat, 3 Jun 2017 01:01:21 +0000 (01:01 +0000)]
Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev
Winson Chung [Sat, 3 Jun 2017 00:51:51 +0000 (00:51 +0000)]
Merge "Fix issue with jumping PIP when IME shows." into oc-dev am:
52a4125ffd
am:
159150c64a
Change-Id: Ie5a84b07a94966ba811e7d07a552cd3fa20e8cec
Winson Chung [Sat, 3 Jun 2017 00:44:58 +0000 (00:44 +0000)]
Merge "Fix issue with jumping PIP when IME shows." into oc-dev
am:
52a4125ffd
Change-Id: Ifc985e6368555fa1332315a1a6a52ced7fb705bd
TreeHugger Robot [Sat, 3 Jun 2017 00:35:38 +0000 (00:35 +0000)]
Merge "Fix issue with jumping PIP when IME shows." into oc-dev
nharold [Sat, 3 Jun 2017 00:15:53 +0000 (00:15 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager" am:
4f6ec3d11d am:
c530c01744 am:
3c1484c715
am:
7577a2ff56
Change-Id: Iafed2773a6d32542b051d944341533b2190aa284
nharold [Sat, 3 Jun 2017 00:04:41 +0000 (00:04 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager" am:
4f6ec3d11d am:
c530c01744
am:
3c1484c715
Change-Id: Idc082c1ab2aac63ad61e5fc74be7fa75cf6e686f
nharold [Fri, 2 Jun 2017 23:57:05 +0000 (23:57 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager" am:
4f6ec3d11d
am:
c530c01744
Change-Id: I529711b4a658cdf82e223194ebae4ecf1a7f3ce2
nharold [Fri, 2 Jun 2017 23:49:33 +0000 (23:49 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager"
am:
4f6ec3d11d
Change-Id: If2b8a92171f9d9f7d1b9aa89cf6fc90efe2f386d
Adam Lesinski [Thu, 1 Jun 2017 22:22:57 +0000 (15:22 -0700)]
AAPT2: Allow undefined resources (placeholders)
A resource defined like so:
<item type="drawable" name="foo" />
should be assigned the value @null.
The only exception is for <string> resources, which are given the
empty string value (since <string></string> is ambiguous). The decision
to use "" is based off the fact that old AAPT used to assign "" to all
undefined resources, even non-string ones.
Bug:
38425050
Test: make aapt2_tests
Change-Id: Ib3e0f6f83d16ddd8b279c9fd44a07a37867b85e9
nharold [Fri, 2 Jun 2017 23:40:16 +0000 (23:40 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager"
TreeHugger Robot [Fri, 2 Jun 2017 23:35:44 +0000 (23:35 +0000)]
Merge "Add device and carrier flags for video calling fallback"
TreeHugger Robot [Fri, 2 Jun 2017 23:31:01 +0000 (23:31 +0000)]
Merge "Use a PopupWindow to show tooltips"
Chong Zhang [Fri, 2 Jun 2017 17:52:04 +0000 (10:52 -0700)]
Add media.codec to native stack dump list
This is still needed for non-treble devices.
Test: do 'adb shell bugreport' on angler, and check that
'Cmd line: media.codec' and the stacks should be there.
bug:
62297059
Change-Id: Ic46b044e471a2ec3c432bb2fdc6afd6fb1f8090e
Winson Chung [Tue, 23 May 2017 23:22:08 +0000 (16:22 -0700)]
Workaround to ensure that PIP activities have a visible shadow.
- When the window for the activity enters PIP, update the outline provider
to override the alpha of the shadow (to be opaque) to ensure that is is
visible. Only applies to the task root activity.
Bug:
36741700
Test: Launch YT, ensure that there is a shadow when after it enters PIP
Test: go/wm-smoke
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: If089dae84e4916d3d0e7bbeb316215b46e522e05
John Reck [Fri, 2 Jun 2017 22:50:09 +0000 (15:50 -0700)]
Workaround glitches from SOFT_INPUT_ADJUST_PAN
Change-Id: I1ee0c7d434eb03667bd5e838ea891db73651a994
Fixes:
62073166
Test: Repro app in bug
Chris Wren [Fri, 2 Jun 2017 22:51:15 +0000 (22:51 +0000)]
Merge "add channel and group tags to the notificaiton logs" into oc-dev am:
76e76a5c26
am:
6b88afda65
Change-Id: I840c89e34b00cf505e50897bc7ba433f37a67dff
Chris Wren [Fri, 2 Jun 2017 22:44:26 +0000 (22:44 +0000)]
Merge "add channel and group tags to the notificaiton logs" into oc-dev
am:
76e76a5c26
Change-Id: I0386428f5a8f8c8c0ac2cec5dc98ad35f5b3042d
Brad Ebinger [Fri, 2 Jun 2017 22:40:53 +0000 (22:40 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am:
75b7ef15f6 am:
bbe9e26247 am:
99533575b2
am:
ab9ad6446a
Change-Id: I50ec5d2c4646592d7633e2e453dfa342b4c2cbcf
TreeHugger Robot [Fri, 2 Jun 2017 22:34:06 +0000 (22:34 +0000)]
Merge "add channel and group tags to the notificaiton logs" into oc-dev
Brad Ebinger [Fri, 2 Jun 2017 22:33:39 +0000 (22:33 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am:
75b7ef15f6 am:
bbe9e26247
am:
99533575b2
Change-Id: Ie29e837b6f952249683440f09630a587795238fa
Brad Ebinger [Fri, 2 Jun 2017 22:26:31 +0000 (22:26 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am:
75b7ef15f6
am:
bbe9e26247
Change-Id: I32989c307a3c251e1d9df65cf6c91b4b29a2452e
Brad Ebinger [Fri, 2 Jun 2017 22:19:31 +0000 (22:19 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
am:
75b7ef15f6
Change-Id: I7075ab7524d363ade4f42d7d3d33251243707e8a
Andrew Zeng [Fri, 2 Jun 2017 22:12:14 +0000 (22:12 +0000)]
Merge "Notify keyguard of when power button is pressed." into oc-dev am:
dd273de09e
am:
3793a4ee3a
Change-Id: Ifea8a9b93f0d8c1945f3b6c7b15159b08019b9f1
jackqdyulei [Fri, 2 Jun 2017 20:26:20 +0000 (13:26 -0700)]
Update strings related to BatteryInfo
Bug:
37201139
Test: Build
Change-Id: I399fb6cddc2f510d4fb0103db74d82d3cf15f2c8
Brad Ebinger [Fri, 2 Jun 2017 22:09:47 +0000 (22:09 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
Tony Mantler [Fri, 26 May 2017 20:34:46 +0000 (13:34 -0700)]
Move strings to SettingsLib so TV can use them
Bug:
38496265
Test: Compiles
Change-Id: I68b535ba490e979a1869b7ea7e2be7737aaaff95
Merged-In: I68b535ba490e979a1869b7ea7e2be7737aaaff95
TreeHugger Robot [Fri, 2 Jun 2017 22:06:32 +0000 (22:06 +0000)]
Merge "Implement HW Bitmap for Skia pipeline"
Andrew Zeng [Fri, 2 Jun 2017 22:03:30 +0000 (22:03 +0000)]
Merge "Notify keyguard of when power button is pressed." into oc-dev
am:
dd273de09e
Change-Id: I2e8061b695e1823ea9ab7b46c8fdb78111601ced
Tony Mantler [Fri, 26 May 2017 20:34:46 +0000 (13:34 -0700)]
Move strings to SettingsLib so TV can use them
Bug:
38496265
Test: Compiles
Change-Id: I68b535ba490e979a1869b7ea7e2be7737aaaff95
TreeHugger Robot [Fri, 2 Jun 2017 21:54:10 +0000 (21:54 +0000)]
Merge "Notify keyguard of when power button is pressed." into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 21:39:46 +0000 (21:39 +0000)]
Merge "Unminimize to save divider position after rotation"
Winson Chung [Fri, 2 Jun 2017 21:34:52 +0000 (14:34 -0700)]
Handling cases with a null bitmap.
- This can happen either if an app creates an ActivityOptions without a
thumbnail, or if the call to create a hardware bitmap fails for any
reason. Just ignore the thumbnail for the transition in this case.
Bug:
62296016
Test: Have not been able to reproduce, but this is just a logical change
Change-Id: I30776b651df1f42118fe1d317fa4817261a6e977
Sudheer Shanka [Fri, 2 Jun 2017 21:28:19 +0000 (21:28 +0000)]
Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev am:
ab17493ef3
am:
599bc3f19f
Change-Id: I3ad80361f65f6de1f06f9758219d02272b300c68
Sudheer Shanka [Fri, 2 Jun 2017 21:18:09 +0000 (21:18 +0000)]
Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev
am:
ab17493ef3
Change-Id: I649da92e3f5451886543f7edd8e107166b8c0125
Sudheer Shanka [Fri, 2 Jun 2017 21:10:32 +0000 (21:10 +0000)]
Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev
Ta-wei Yen [Fri, 2 Jun 2017 18:07:07 +0000 (11:07 -0700)]
Add device and carrier flags for video calling fallback
These flags let the system dialer/contacts/SMS app determine if
integration with video calling apps are allowed if the carrier video
calling is not available.
EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK in PhoneAccount.getExtras()
should be checked first. This flag is disabled by default and OEMs
will need to enable it.
If the device supports the fallback, then
CarrierConfigManager.KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL should be
checked so individual carriers can ban the feature. This flag is
allowed by default.
Change-Id: Id46f684254402acb9142f87684ddff2d830f1701
Fixes:
62264468
Test: manual
Peter Qiu [Fri, 2 Jun 2017 20:45:26 +0000 (20:45 +0000)]
Merge "wifi: add utility function to return saved configurations" into oc-dev am:
ca2f8a2b13
am:
64fafcd35d
Change-Id: I1e8e009e6f2230b36a5d831037aa4ef374fb8be5
Peter Qiu [Fri, 2 Jun 2017 20:38:47 +0000 (20:38 +0000)]
Merge "wifi: add utility function to return saved configurations" into oc-dev
am:
ca2f8a2b13
Change-Id: I7d59b064248b7f218972bf461a31545928a6bf0c
TreeHugger Robot [Fri, 2 Jun 2017 20:25:12 +0000 (20:25 +0000)]
Merge "wifi: add utility function to return saved configurations" into oc-dev
Android Build Merger (Role) [Fri, 2 Jun 2017 20:22:55 +0000 (20:22 +0000)]
Merge "Merge "Use a PopupWindow to show tooltips" into oc-dev am:
8493543ce3 am:
629c15297f"
OSDN Git Service
