Suprabh Shukla
f598369c15
Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev
...
am: 653e7bedb4
2016-05-23 18:03:35 +00:00
Suprabh Shukla
1c49c33f3e
Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev
...
am: 653e7bedb4
2016-05-23 18:03:32 +00:00
TreeHugger Robot
bc0a5cb2f8
Merge "Fixed flicker when docking task from recents." into nyc-dev
2016-05-23 18:01:13 +00:00
TreeHugger Robot
653e7bedb4
Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev
2016-05-23 17:57:50 +00:00
Selim Cinek
53c4d3d23e
Fixed a crash with the autocancelling
...
Change-Id: If9cb9cc89bafbc9e7e053b4758382239bac97adc
Fixes: 28878632
Fixes: 28898623
2016-05-23 10:56:34 -07:00
Wale Ogunwale
cac5c322da
Only resuming starting dontWaitForPause activity once
...
For a starting activity that doesn't wait for pause, we can resume it
when ensuring visible activities when pausing back stacks. If this
happens, there is no need to try to resume it again.
Bug: 28853615
Change-Id: Iee40b80eb13ab3fd65fdce0c100c4051e64f229f
2016-05-23 10:56:33 -07:00
Android Build Merger (Role)
a3bfb0e086
Merge "Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 am: 66bd6bca16" into nyc-mr1-dev-plus-aosp
2016-05-23 17:53:56 +00:00
Chris Wren
7ba3fda459
Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619
...
am: 66bd6bca16
2016-05-23 17:53:28 +00:00
Chris Wren
f9f6d64ed8
Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619
...
am: 688ebc6f75
2016-05-23 17:53:25 +00:00
Chris Wren
688ebc6f75
Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
...
am: 0a9ccf2619
2016-05-23 17:47:29 +00:00
Chris Wren
66bd6bca16
Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
...
am: 0a9ccf2619
2016-05-23 17:47:29 +00:00
Chris Wren
0a9ccf2619
Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
2016-05-23 17:44:16 +00:00
Philip P. Moltmann
a26b775dc1
Add Samsung print recommendation plugin.
...
The code follows the same pattern as the HP and Mopria plugins. As this code is contributed by a 3rd I'd rather submit this as is and let the original submitter clean it up once it appears in AOSP.
The code should not affect anything outside of the package it is in. In the package the code is strongly isolated so that one plugin cannot cause issues with another plugin.
The code was minimally tested on a Samsung SCX-3406FW .
Bug: 28908572
Change-Id: I33c2673d06711902dbd0f1d82563cf5d3fbfe86a
(cherry picked from commit 83defde085
2016-05-23 17:41:40 +00:00
Sid Soundararajan
4332dda9a7
Add a check to adjust thumbnail scaling for full screen shots on TV
...
This should let us get away with taking smaller bitmaps for TV.
BUG: 28371792
Change-Id: Ia5d43dd48c57c4dd519b46f0c0d0ec94df5f42a9
2016-05-23 10:39:00 -07:00
Android Build Merger (Role)
a418a9f11a
Merge "Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5 am: 741e0b14cf" into nyc-mr1-dev-plus-aosp
2016-05-23 17:33:19 +00:00
Tony Mak
4c402e1805
Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5
...
am: 741e0b14cf
2016-05-23 17:32:50 +00:00
Tony Mak
6bd271c7d4
Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5
...
am: 23642330a7
2016-05-23 17:32:23 +00:00
Winson
3b272e6282
Catching all exceptions when docking. am: f60a4af047
...
am: 7fea69c3b6
2016-05-23 17:32:19 +00:00
Winson
155ac5d024
Catching all exceptions when docking. am: f60a4af047
...
am: 5e04aeb328
2016-05-23 17:28:20 +00:00
Tony Mak
23642330a7
Merge "Remove PROPERTY_WORK_CALL" into nyc-dev
...
am: 5ee420c0d5
2016-05-23 17:26:45 +00:00
Winson
7fea69c3b6
Catching all exceptions when docking.
...
am: f60a4af047
2016-05-23 17:26:43 +00:00
Tony Mak
741e0b14cf
Merge "Remove PROPERTY_WORK_CALL" into nyc-dev
...
am: 5ee420c0d5
2016-05-23 17:23:51 +00:00
Winson
5e04aeb328
Catching all exceptions when docking.
...
am: f60a4af047
2016-05-23 17:23:47 +00:00
Tony Mak
5ee420c0d5
Merge "Remove PROPERTY_WORK_CALL" into nyc-dev
2016-05-23 17:17:27 +00:00
Winson
f60a4af047
Catching all exceptions when docking.
...
- Catch all exceptions thrown when docking an activity (similar to when
we start an activity) to allow us to gracefully handle the failure and
animate the task back into the stack.
Bug: 28867188
Change-Id: I3f80d261343c0161c5cbfd08a05a1fc6157f653e
2016-05-23 17:12:33 +00:00
Philip P. Moltmann
8aa4856f22
Correct height of add printer list separator
...
Do not use listPreferredItemHeightSmall a height for list separator.
Fixes: 28907033
Change-Id: Ibe9744f28e7bd17fb5a298fa3cff0e3d403de10f
2016-05-23 09:54:39 -07:00
Gustav Sennton
fd07efa44e
Load WebView even if WebView relro creation times out.
...
There are cases in which the WebView Update Service can stop switching
WebView providers (if the update service is notified about relro
creations an incorrect number of times) and in those cases apps will
fail to load WebView.
In this CL we mitigate this problem by allowing apps to load WebView
even if the time-out is reached and we also decrease the time-out so
apps are less likely to ANR when waiting for the time-out.
This CL does not prevent the update service from ending up in a bad
state - so we will still end up crashing apps if the current WebView
implementation is uninstalled after relro creation fails.
Bug: 28860862
2016-05-23 17:49:05 +01:00
Jean-Michel Trivi
f04fab160a
Recording activity notification: return list of configuration
...
Use a list of configurations instead of an array
Bug 28819230
Change-Id: Ia4a3cdabf8337cfb98abe4d0055d497bcab8a5ee
2016-05-23 09:44:58 -07:00
Felipe Leme
a4aba6eaf5
Fixed enforceMeteredApnPolicy when Data Saver is on.
...
When enforceMeteredApnPolicy() is called when Data Saver mode is on and
the caller's UID is not whitelisted, it should add a
NET_CAPABILITY_NOT_METERED to the capabilities.
Change-Id: Ieed4f4a7634ee023ec58c91859263655e0ba62d4
Fixes: 28608499 (and https://code.google.com/p/android/issues/detail?id=208478 )
2016-05-23 09:43:53 -07:00
Victor Chang
12753ded44
Fix Certificate authority installed notification is gone when turning off and on the work mode.
...
cause: Work mode is turned on before entering USER_STOPPED state.
Thus, BOOT_COMPLETED broadcast is not sent, but the notification has been dismissed.
use USER_STARTED + USER_UNLOCKED because both are foreground.
Bug: 28864104
Change-Id: I4796b61586e194d8367b9e52a9c56f858cbcbe7d
2016-05-23 17:41:01 +01:00
Bill Yi
9306f9d98a
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours
...
am: 5745dc0e45
2016-05-23 16:10:55 +00:00
Bill Yi
7b71c6095d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours
...
am: f2475c29e1
2016-05-23 16:10:50 +00:00
Wale Ogunwale
8c09c7dd7a
Fixed flicker when docking task from recents.
...
Regression introduced by ag/1044640 where we don't want recents to the
visible if it's stack isn't fullscreen or focused. However, it is
possible for switching the home stack to not-fullscreen to prolonged
while transitioning to split-screen mode from recents. We now check
for if the docked stack exists which is a better indicator we are in
split-screen mode regardless of if the stask is fullscreen.
Bug: 28882948
Bug: 28246419
Change-Id: I54c02cc1486e7b5bf6a20dd0706c9bfe3f40a953
2016-05-23 09:10:24 -07:00
Android Build Merger (Role)
bc1848662b
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 0b9b896202 -s ours" into nyc-mr1-dev-plus-aosp
2016-05-23 16:08:11 +00:00
Bill Yi
c1de9659e4
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours
...
am: 0b9b896202
2016-05-23 16:07:49 +00:00
Android Build Merger (Role)
fa764c3fa3
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours am: a882b8c150 -s ours" into nyc-mr1-dev-plus-aosp
2016-05-23 16:07:12 +00:00
Android Build Merger (Role)
d5f71b7f7d
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours am: 712c2cb2d2 -s ours" into nyc-mr1-dev-plus-aosp
2016-05-23 16:07:01 +00:00
Bill Yi
8bca50f4c0
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours
...
am: a882b8c150
2016-05-23 16:06:36 +00:00
Bill Yi
a0f6be6363
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours
...
am: 712c2cb2d2
2016-05-23 16:06:32 +00:00
Android Build Merger (Role)
71caaa9f9d
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 1a49e73d2a -s ours" into nyc-mr1-dev-plus-aosp
2016-05-23 16:05:52 +00:00
Android Build Merger (Role)
720c041b1a
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours" into nyc-mr1-dev am: bb434299c7 -s ours" into nyc-mr1-dev-plus-aosp
2016-05-23 16:05:42 +00:00
Android Build Merger (Role)
71f8032a6a
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 18947ba2fa -s ours" into nyc-mr1-dev-plus-aosp
2016-05-23 16:05:30 +00:00
Android Build Merger (Role)
b8b4aba44f
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7b9f32be79 -s ours" into nyc-mr1-dev-plus-aosp
2016-05-23 16:05:21 +00:00
Android Build Merger (Role)
16dd875f8a
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e354740de -s ours" into nyc-mr1-dev-plus-aosp
2016-05-23 16:05:14 +00:00
Bill Yi
8c14e3ad91
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours
...
am: 1a49e73d2a
2016-05-23 16:04:06 +00:00
Bill Yi
35d17c30e1
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours" into nyc-mr1-dev
...
am: bb434299c7
2016-05-23 16:04:01 +00:00
Bill Yi
a4228591c8
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 18947ba2fa
2016-05-23 16:03:54 +00:00
Bill Yi
32fd2e03c5
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 7b9f32be79
2016-05-23 16:03:46 +00:00
Bill Yi
8b75a32041
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 2e354740de
2016-05-23 16:03:37 +00:00
Bill Yi
5745dc0e45
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 6a983faab3
2016-05-23 16:03:30 +00:00
