OSDN Git Service
Robert Carr [Tue, 6 Jun 2017 00:09:17 +0000 (00:09 +0000)]
Merge "Reinstate SurfaceView Background from N" into oc-dev
am:
71044d6ba1
Change-Id: I5a4e8a5c8c45add308b115bc447f85393d572e00
TreeHugger Robot [Mon, 5 Jun 2017 23:57:01 +0000 (23:57 +0000)]
Merge "Reinstate SurfaceView Background from N" into oc-dev
Lucas Dupin [Mon, 5 Jun 2017 23:40:12 +0000 (23:40 +0000)]
Merge "Fix icon tint on notification shelf" into oc-dev
am:
285ad4ce66
Change-Id: Ifbc2c1829182aa47de9e835a3bbeac7146a31d1b
TreeHugger Robot [Mon, 5 Jun 2017 23:29:42 +0000 (23:29 +0000)]
Merge "Fix icon tint on notification shelf" into oc-dev
Winson Chung [Mon, 5 Jun 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Initialize last-orientation to ensure we don't skip loading config." into oc-dev
am:
5fc8f7d08a
Change-Id: I1ca302446a3bff3c1f3096f353ca8b081e13e816
TreeHugger Robot [Mon, 5 Jun 2017 22:37:02 +0000 (22:37 +0000)]
Merge "Initialize last-orientation to ensure we don't skip loading config." into oc-dev
Jeff Sharkey [Mon, 5 Jun 2017 22:28:21 +0000 (22:28 +0000)]
Merge "Annotate @SystemApi with required permissions." into oc-dev
am:
c1406978a4
Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
Jeff Sharkey [Mon, 5 Jun 2017 22:19:41 +0000 (22:19 +0000)]
Merge "Annotate @SystemApi with required permissions." into oc-dev
Android Build Merger (Role) [Mon, 5 Jun 2017 21:59:16 +0000 (21:59 +0000)]
Merge "Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff am:
51a89ee90c am:
102b9e5968" into oc-dev-plus-aosp
Erik Wolsheimer [Mon, 5 Jun 2017 21:58:11 +0000 (21:58 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff am:
51a89ee90c
am:
102b9e5968
Change-Id: If7e8d4d2cdc734bab90b4abf0f2cba16645e4a6d
Erik Wolsheimer [Mon, 5 Jun 2017 21:56:29 +0000 (21:56 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff am:
51a89ee90c
am:
2c5e537e6c
Change-Id: Ie8f090c0049715bfc2d23a4f2d1f8d90c227b0e2
Erik Wolsheimer [Mon, 5 Jun 2017 21:46:36 +0000 (21:46 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff
am:
51a89ee90c
Change-Id: I982b94c155849061a667b1bf90f7a511bb81b1c5
Erik Wolsheimer [Mon, 5 Jun 2017 21:46:26 +0000 (21:46 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff
am:
51a89ee90c
Change-Id: I154876bd0294d0e31af63ed2e24c91d243eae56f
Erik Wolsheimer [Mon, 5 Jun 2017 21:38:33 +0000 (21:38 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev
am:
7a5dd1c3ff
Change-Id: Ida35556f6d57113ad06c736ef780580b814f673e
Jason Monk [Mon, 5 Jun 2017 21:37:29 +0000 (21:37 +0000)]
Merge "Fix tinting of guest icon in QS footer" into oc-dev
am:
8490ed92e1
Change-Id: I68e4c923defcddf528472504561d9a294ddb5569
Sudheer Shanka [Mon, 5 Jun 2017 21:31:19 +0000 (21:31 +0000)]
Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev
am:
057bad9c9d
Change-Id: I536deea7b77c202b788f6d985574a9629d9bd1f1
TreeHugger Robot [Mon, 5 Jun 2017 21:26:39 +0000 (21:26 +0000)]
Merge "Fix tinting of guest icon in QS footer" into oc-dev
TreeHugger Robot [Mon, 5 Jun 2017 21:24:44 +0000 (21:24 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev
Sudheer Shanka [Mon, 5 Jun 2017 21:22:32 +0000 (21:22 +0000)]
Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev
Jason Monk [Mon, 5 Jun 2017 19:56:42 +0000 (19:56 +0000)]
Merge "Fix up some jank from unnecessary reinflation" into oc-dev
am:
f6e2099063
Change-Id: I32bbb4c1bbe5a477565ceb0382cc859c53283fdf
Jason Monk [Mon, 5 Jun 2017 19:50:06 +0000 (19:50 +0000)]
Merge "Fix up some jank from unnecessary reinflation" into oc-dev
Wale Ogunwale [Mon, 5 Jun 2017 19:39:30 +0000 (19:39 +0000)]
Merge "Added mising sendToTarget message for dismissing docked stack" into oc-dev
am:
6cc151468b
Change-Id: Ia4a52090fa9353fee4333da78d218b4a967b9500
Jeff Sharkey [Fri, 2 Jun 2017 23:36:26 +0000 (17:36 -0600)]
Annotate @SystemApi with required permissions.
Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.
Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.
This is purely a docs change; no logic changes are being made.
Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug:
62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
TreeHugger Robot [Mon, 5 Jun 2017 19:18:05 +0000 (19:18 +0000)]
Merge "Added mising sendToTarget message for dismissing docked stack" into oc-dev
Daniel Sandler [Mon, 5 Jun 2017 19:15:12 +0000 (19:15 +0000)]
Merge changes from topic 'dungeon' into oc-dev
am:
36a673a7d7
Change-Id: Idcad938ed14dac66e6b701cefd9dc79c499eb645
Daniel Sandler [Mon, 5 Jun 2017 19:03:26 +0000 (19:03 +0000)]
Merge changes from topic 'dungeon' into oc-dev
* changes:
Hide redundant foreground service notifications.
Updates to Dianne's Dungeon.
Jerry Zhang [Mon, 5 Jun 2017 18:45:09 +0000 (18:45 +0000)]
Merge "Remove ptp from persist config on boot" into oc-dev
am:
1d1cf13056
Change-Id: I6c9afcc05fa88bbbbe63ddd3ab948e887c350505
Jerry Zhang [Mon, 5 Jun 2017 18:36:58 +0000 (18:36 +0000)]
Merge "Remove ptp from persist config on boot" into oc-dev
Adam Lesinski [Mon, 5 Jun 2017 17:54:37 +0000 (17:54 +0000)]
Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev
am:
2f84c4715d
Change-Id: I266b8648e9aa292befa02c4e7dc0ce54f0b26e21
Sudheer Shanka [Fri, 2 Jun 2017 23:48:13 +0000 (16:48 -0700)]
Ignore entries for isolated uids if there's no mapping for them.
Bug:
25195548
Test: manual
Change-Id: If5aa7e194f4d43f2a7068899b9aa6584bfb2b7cc
Adam Lesinski [Mon, 5 Jun 2017 17:34:57 +0000 (17:34 +0000)]
Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev
Jason Monk [Mon, 5 Jun 2017 16:59:49 +0000 (12:59 -0400)]
Fix tinting of guest icon in QS footer
Test: visual
Change-Id: I1daaac94e6bbff2e94583e1501c43beb4d9f757f
Fixes:
62339982
Jason Monk [Mon, 5 Jun 2017 15:33:48 +0000 (11:33 -0400)]
Fix up some jank from unnecessary reinflation
Don't need to re-inflate fragments because of ui mode change.
Test: manual
Change-Id: I8cb8ff4f64b5c1cb5982d39c6acced682eaa4d41
Fixes:
62041537
Erik Wolsheimer [Mon, 5 Jun 2017 16:49:28 +0000 (16:49 +0000)]
Revert "Fix race condition triggered by quick stop/start of Dream"
Causes another race condition
This reverts commit
69515b2261335be4bd8510ed5a40a6bed3d7b48f.
Bug:
62147987
Change-Id: Ibe6f9bc14ed6cc35d3a23d52300657eaed9bb6d8
Todd Kennedy [Mon, 5 Jun 2017 16:44:45 +0000 (16:44 +0000)]
Merge "Protect instant apps from full apps" into oc-dev
am:
4972aa30bf -s ours
Change-Id: I8e42b3f3b54b86f1bc7b2d3dc29973d96b7eb3a5
TreeHugger Robot [Mon, 5 Jun 2017 16:35:22 +0000 (16:35 +0000)]
Merge "Protect instant apps from full apps" into oc-dev
Julia Reynolds [Mon, 5 Jun 2017 15:30:31 +0000 (15:30 +0000)]
Merge "Annotate locks" into oc-dev
am:
373ab72112
Change-Id: I7b84a944d19c1a51d3893149e98c9e6ac96ba2af
Julia Reynolds [Mon, 5 Jun 2017 15:22:53 +0000 (15:22 +0000)]
Merge "Annotate locks" into oc-dev
Dan Sandler [Sun, 28 May 2017 16:18:53 +0000 (12:18 -0400)]
Hide redundant foreground service notifications.
If an app with a foreground service has (at least one)
FLAG_FOREGROUND notification shown to the user, we allow
that to satisfy the requirement that the user be informed
about such things. But if the fg notification or its channel
is blocked by the user, we show the NOTE_FOREGROUND_SERVICES
notification (a/k/a Dianne's Dungeon) provided to us by the
activity manager.
Note that if even one of the foreground processes for the
current user is missing its disclosure notification, the
user will see the whole dungeon.
Bug:
36891897
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
Change-Id: I4f5d96f80b7c1901faadb56661a42d26f746aa88
Dan Sandler [Thu, 25 May 2017 04:15:49 +0000 (00:15 -0400)]
Updates to Dianne's Dungeon.
- new EKG icon
- set the notification timestamp to the oldest service
start time, so you have some idea how long things have been
this way
- minor text fixes
Bug:
36891897
Test: runtest -x cts/tests/app/src/android/app/cts/ServiceTest.java
Change-Id: I99db280cde8ca3ecd7205cd44fac159d8f652ca2
Wale Ogunwale [Mon, 5 Jun 2017 14:09:35 +0000 (07:09 -0700)]
Added mising sendToTarget message for dismissing docked stack
Toast that an app doesn't support split screen wasn't displaying because
of missing line to actually send the
NOTIFY_ACTIVITY_DISMISSING_DOCKED_STACK_MSG message.
Test: Dock an app and the launch an other app that doesn't support
split-screen and make sure the "doesn't support split-screen" toast
shows up.
Test: go/wm-smoke
Fixes:
62281412
Change-Id: Ia2cb3085b6c6bfd27cf9e825315b8ddc89cf5bcd
Julia Reynolds [Mon, 5 Jun 2017 13:20:23 +0000 (13:20 +0000)]
Merge "Don't allow blocked apps to post notifications" into oc-dev
am:
2f77da6e10
Change-Id: I17808b200cba543f163bea8e3326bcce4792ef1f
Julia Reynolds [Mon, 5 Jun 2017 13:12:51 +0000 (13:12 +0000)]
Merge "Don't allow blocked apps to post notifications" into oc-dev
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
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
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:31:40 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
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 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 10:14:54 +0000 (03:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f16f808f5ab850fb3bb459ea63548471d44eeca
Auto-generated-cl: translation import
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
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: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: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: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
Adam Lesinski [Thu, 1 Jun 2017 22:22:57 +0000 (15:22 -0700)]
DO NOT MERGE: 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:49:33 +0000 (23:49 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager"
am:
4f6ec3d11d
Change-Id: If2b8a92171f9d9f7d1b9aa89cf6fc90efe2f386d
nharold [Fri, 2 Jun 2017 23:40:16 +0000 (23:40 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager"
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:44:26 +0000 (22:44 +0000)]
Merge "add channel and group tags to the notificaiton logs" into oc-dev
am:
76e76a5c26
Change-Id: I0386428f5a8f8c8c0ac2cec5dc98ad35f5b3042d
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
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
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
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
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
Robert Carr [Fri, 2 Jun 2017 21:21:03 +0000 (14:21 -0700)]
Reinstate SurfaceView Background from N
In N we used a Dim-Layer to add a background to SurfaceView, from
the WM side. In O we forgot to reimplment this with the new SurfaceView
and so we once again can have holes for apps which don't implement
surfaceRedrawNeeded.
Bug:
62113351
Test: Manual from bug. go/wm-smoke
Change-Id: If3dac51886b9a8083140da7b5bc1b349da57860f
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
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
Brad Ebinger [Fri, 2 Jun 2017 17:56:40 +0000 (10:56 -0700)]
Adds ACCESS_CLASS_BLOCKED Disconnect cause
Adds the ACCESS_CLASS_BLOCKED Disconnect cause in order
to allow the dialer to take action when this happens
during a VT call.
Bug:
33821263
Test: Build
Change-Id: I9afdd90f0a8a562b626b730dbb1b03cf37776ebd
OSDN Git Service
