OSDN Git Service
Esteban Talavera [Fri, 11 Dec 2015 15:22:34 +0000 (15:22 +0000)]
Only system can set application restrictions via UserManager
Preventing apps with MANAGE_USERS from managing application
restrictions via UserManager. Application restrictions should
only be set via DevicePolicyManager.setApplicationRestrictions,
or via Settings (for restricted profiles).
Bug:
22541936
Change-Id: Ieed51ef54b4c23a73f383465e9af9b3bcf18a514
Brad Ebinger [Mon, 14 Dec 2015 16:46:49 +0000 (08:46 -0800)]
Null pointer fix for StateMachine
Checks if StateMachine is null before calling callbacks.
Bug-Id:
26176787
Change-Id: I7ee92326e99e18a3b7045ccf098b52acfaff9a15
Winson Chung [Mon, 14 Dec 2015 16:35:02 +0000 (16:35 +0000)]
Merge "Revert "Saving the stack state when you rotate.""
Winson Chung [Mon, 14 Dec 2015 16:34:31 +0000 (16:34 +0000)]
Revert "Saving the stack state when you rotate."
This reverts commit
bf0be0a8030b91c7e75c23230c1f89a1536aa7eb.
Change-Id: I40b852889980473aea02828b5b0fe29c21951638
Winson Chung [Mon, 14 Dec 2015 16:34:29 +0000 (16:34 +0000)]
Merge "Revert "Removing historical tasks when packages are uninstalled.""
Winson Chung [Mon, 14 Dec 2015 16:34:12 +0000 (16:34 +0000)]
Revert "Removing historical tasks when packages are uninstalled."
This reverts commit
5d1413e7c391fdb1325c6833399c10a8448354dc.
Change-Id: I6ca79949b4c92a5825554b91f4350685fa605c8f
Winson Chung [Mon, 14 Dec 2015 16:34:00 +0000 (16:34 +0000)]
Revert "Fixing build."
This reverts commit
ae0803182a467ada59613fcbaf21b8a3537f8c2b.
Change-Id: Ieb797e73adfdbfc359ca413f49d56211ae6c70db
Winson Chung [Mon, 14 Dec 2015 16:19:38 +0000 (11:19 -0500)]
Fixing build.
Change-Id: I4bc5dcc5026179fe2021fb39c20319fbb8f4c5cb
Andreas Gampe [Mon, 14 Dec 2015 16:15:38 +0000 (16:15 +0000)]
Merge "Frameworks/base: Fix Notification code"
Winson Chung [Mon, 14 Dec 2015 15:40:41 +0000 (15:40 +0000)]
Merge "Removing historical tasks when packages are uninstalled."
Winson Chung [Mon, 14 Dec 2015 15:40:29 +0000 (15:40 +0000)]
Merge "Saving the stack state when you rotate."
Jason Monk [Mon, 14 Dec 2015 15:39:55 +0000 (15:39 +0000)]
Merge "Support dnd condition in Settings"
Winson Chung [Fri, 11 Dec 2015 15:25:57 +0000 (10:25 -0500)]
Removing historical tasks when packages are uninstalled.
Change-Id: I9eb1307264fab8dcace732af2290ca419fcc548a
Winson Chung [Fri, 11 Dec 2015 15:25:46 +0000 (10:25 -0500)]
Saving the stack state when you rotate.
- Saving the focus and stack scroll, along with
the history visibility on configuration change.
Change-Id: I159d2f0f6c58dac46cb3b16ee4d9e17c426ffb35
Winson Chung [Fri, 11 Dec 2015 15:23:59 +0000 (10:23 -0500)]
Fix: Affiliated tasks not showing when history is enabled.
- Because these tasks may not have valid
last-active times (they can be launched in the
background), the historical state should reflect
the task that they are affiliated with.
Bug:
26043228
Change-Id: I04db9effc371783a80bea80bd0a45b666269ead1
Gustav Sennton [Mon, 14 Dec 2015 14:33:56 +0000 (14:33 +0000)]
Merge "Add functionality for changing WebView provider."
Geoff Mendal [Mon, 14 Dec 2015 13:56:08 +0000 (13:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 14 Dec 2015 13:55:28 +0000 (13:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 14 Dec 2015 13:55:22 +0000 (05:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3e31c8e699bedb04b82b364311d9a504527cca98
Auto-generated-cl: translation import
Geoff Mendal [Mon, 14 Dec 2015 13:54:39 +0000 (05:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5dca6baedea38294b9e84939627ac50d4cb8e6a5
Auto-generated-cl: translation import
Geoff Mendal [Mon, 14 Dec 2015 13:27:57 +0000 (05:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1b007d3e22aef09f2a1162478a2ed9b148f67cfb
Auto-generated-cl: translation import
Nicolas Geoffray [Mon, 14 Dec 2015 13:04:06 +0000 (13:04 +0000)]
Merge "Special case system_server to not create the JIT code cache."
Daichi Hirono [Mon, 14 Dec 2015 05:56:23 +0000 (05:56 +0000)]
Merge "Add document type to MtpDatabase."
Felipe Leme [Mon, 14 Dec 2015 03:34:10 +0000 (03:34 +0000)]
Merge "Fixed ActivityChooser logic for the initial case."
Terry (Woncheol) Heo [Mon, 14 Dec 2015 02:40:03 +0000 (02:40 +0000)]
Merge "CEC: Prevent NPE on HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED change"
Jason Monk [Sun, 13 Dec 2015 21:22:37 +0000 (16:22 -0500)]
Support dnd condition in Settings
- Add way to open QS detail panels directly
- Add internal broadcast that can launch apps when dnd mode changes
Change-Id: If2b6350dc31623f3bf2f64c7eb141cff5d3d4e89
Ian Pedowitz [Sun, 13 Dec 2015 21:16:40 +0000 (13:16 -0800)]
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev am:
cf07154e71 am:
911dfe8861
am:
19937f924e -s ours
* commit '
19937f924e65d004855d26b4f6e356bc7a0168fa':
DO NOT MERGE Remove more extras during notification lightening.
Filip Gruszczynski [Sun, 13 Dec 2015 17:04:39 +0000 (17:04 +0000)]
Merge "Exclude status and nav bar from focus monitor."
Filip Gruszczynski [Sun, 13 Dec 2015 17:03:56 +0000 (17:03 +0000)]
Merge "Don't log bad surface size before layout is done."
Ben Wagner [Sat, 12 Dec 2015 17:26:43 +0000 (17:26 +0000)]
Merge "Use 'index' instead of 'ttcIndex' for attribute name."
Ben Wagner [Sat, 12 Dec 2015 05:10:10 +0000 (00:10 -0500)]
Use 'index' instead of 'ttcIndex' for attribute name.
There are two reasons for this. First, the name 'ttcIndex' is over
specific, there are many indexed font containers in addition to ttc,
such as fon, pfr, bdf, and dfont. There may be others in the future.
Second, Skia implemented this attribute with the name 'index' quite
some time ago. By naming this attribute 'index' even existing apps will
be able to use this attribute (including Chrome).
BUG:
10861108
Change-Id: I68d2b69fad304d93313f96bf3365af71906dfe69
Felipe Leme [Sat, 12 Dec 2015 04:22:49 +0000 (04:22 +0000)]
Merge "Cleaned up unit tests."
Geoff Mendal [Sat, 12 Dec 2015 03:57:01 +0000 (03:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 03:56:41 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 03:03:39 +0000 (19:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8bfa1fb1ea3ae52988c001eed14e5597733e595e
Auto-generated-cl: translation import
Felipe Leme [Sat, 12 Dec 2015 03:02:07 +0000 (19:02 -0800)]
Fixed ActivityChooser logic for the initial case.
When ActionSendMultipleConsumerActivity is not the default action, it
just need to be selected, without clicking 'Just Once'
BUG:
25752530
Change-Id: I111063aa0dbba37e0cac8f0572f43a48c659e975
Geoff Mendal [Sat, 12 Dec 2015 03:02:54 +0000 (19:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2360d1f96925f30797c1b33a2f06729690189dac
Auto-generated-cl: translation import
Felipe Leme [Sat, 12 Dec 2015 03:01:56 +0000 (03:01 +0000)]
Merge "Created initial bugreports dir if it doesn't exist."
Geoff Mendal [Sat, 12 Dec 2015 02:52:52 +0000 (02:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 02:52:14 +0000 (18:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id475f3e48918972cc697cf3340212b92d6b2ab0b
Auto-generated-cl: translation import
Geoff Mendal [Sat, 12 Dec 2015 02:47:35 +0000 (02:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 02:46:29 +0000 (18:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I12a72b6ba0efbce0bf7e89489e277c03463fe6d5
Auto-generated-cl: translation import
Geoff Mendal [Sat, 12 Dec 2015 02:36:03 +0000 (02:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 02:30:44 +0000 (18:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I705d74f3ded09c9279ffafcb82560ca2ddf70bdd
Auto-generated-cl: translation import
Jorim Jaggi [Sat, 12 Dec 2015 02:26:24 +0000 (02:26 +0000)]
Merge "Increase touch slop for navigation bar gesture"
Jorim Jaggi [Fri, 11 Dec 2015 00:32:46 +0000 (16:32 -0800)]
Increase touch slop for navigation bar gesture
So it's less likely that a user triggers it by accident.
Change-Id: Ib7b601a672017daceee589ce75d4336911719a61
Jorim Jaggi [Sat, 12 Dec 2015 02:25:07 +0000 (02:25 +0000)]
Merge "Add multi-window entry points logging"
Felipe Leme [Sat, 12 Dec 2015 02:19:26 +0000 (18:19 -0800)]
Created initial bugreports dir if it doesn't exist.
BUG:
25752530
Change-Id: Iec65b88231e26aaa62d301a26b2f51cf92651c72
Filip Gruszczynski [Sat, 12 Dec 2015 01:41:23 +0000 (17:41 -0800)]
Don't log bad surface size before layout is done.
The surface dimensions are calculated when the surface is created.
This might happen before the window had a chance to relayout itself,
so the dimensions passed to the surface will be wrong. This doesn't
happen on subsequent recreations of the surface, because the window
has previous dimensions, but will produce a bad log when the surface
is first created.
Bug:
26061934
Change-Id: I670bbb6d64f5ec7efabe3bd838a116a1d48e74f2
Ian Pedowitz [Sat, 12 Dec 2015 01:18:51 +0000 (17:18 -0800)]
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev am:
cf07154e71
am:
911dfe8861
* commit '
911dfe8861c7d67aab738cf42455837c8a9aefa7':
DO NOT MERGE Remove more extras during notification lightening.
Felipe Leme [Fri, 11 Dec 2015 21:06:45 +0000 (13:06 -0800)]
Cleaned up unit tests.
This refactoring will make it easier to add new test cases for the
upcoming bugreport details notification.
BUG:
25794470
Change-Id: I0bf6ab54a7b4aa1dfa51ad0354682e5764b8a209
Ian Pedowitz [Sat, 12 Dec 2015 01:12:35 +0000 (17:12 -0800)]
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
am:
cf07154e71
* commit '
cf07154e7102de304f1d887c8c2a2ef61b4880d7':
DO NOT MERGE Remove more extras during notification lightening.
Ian Pedowitz [Sat, 12 Dec 2015 01:06:43 +0000 (01:06 +0000)]
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
Dan Sandler [Tue, 8 Dec 2015 20:42:41 +0000 (15:42 -0500)]
DO NOT MERGE Remove more extras during notification lightening.
Basically anything Parcelable needs to go since it might be
quite large. Note that this includes additional extras such as
those contributed by WearableExtender.
Cherry-picked from
5012853de26eac023deda82d138a35677fe6117b
Bug:
26038546
Change-Id: I00eadd2b23dfc4fccf42332df658373bb05b8a45
Wale Ogunwale [Sat, 12 Dec 2015 01:03:49 +0000 (01:03 +0000)]
Merge "Move focus to visible behind activity when we move the home task back"
Brad Ebinger [Sat, 12 Dec 2015 01:01:39 +0000 (01:01 +0000)]
Merge "Add handler callbacks to StateMachine"
Andreas Gampe [Sat, 12 Dec 2015 00:52:34 +0000 (00:52 +0000)]
Merge "Frameworks/base: Avoid useless array allocation"
Tyler Gunn [Sat, 12 Dec 2015 00:38:12 +0000 (00:38 +0000)]
Merge "Add PhoneAccount capability to indicate if VT uses presence."
Andreas Gampe [Sat, 12 Dec 2015 00:08:16 +0000 (16:08 -0800)]
Frameworks/base: Avoid useless array allocation
Don't allocate an unused array.
Bug:
19797138
Change-Id: I40539e7659a21a34a7d49c48bbeb51acf9bfe235
Selim Cinek [Sat, 12 Dec 2015 00:00:40 +0000 (00:00 +0000)]
Merge "Fixed a bug where the notification header was above the guts"
Selim Cinek [Sat, 12 Dec 2015 00:00:27 +0000 (00:00 +0000)]
Merge "Fixed a bug where systemUI would crash when swiping notifications"
Selim Cinek [Fri, 11 Dec 2015 23:59:54 +0000 (23:59 +0000)]
Merge "Fixed a bug where not enough notifications were shown on lockscreen"
Andreas Gampe [Fri, 11 Dec 2015 23:49:07 +0000 (15:49 -0800)]
Frameworks/base: Fix Notification code
Avoid a NullPointerException in NotificationListenerService when
a corrupt notification is found.
Fix not using the return of trim() in NotificationManagerService.
Bug:
19797138
Change-Id: I84dc15eba7b4052a774eb69d36591d100105f169
Selim Cinek [Fri, 11 Dec 2015 23:31:09 +0000 (23:31 +0000)]
Merge "Adapted the header colors to spec"
John Reck [Fri, 11 Dec 2015 23:22:43 +0000 (23:22 +0000)]
Merge "Fix memory leak"
Filip Gruszczynski [Fri, 11 Dec 2015 23:16:36 +0000 (15:16 -0800)]
Exclude status and nav bar from focus monitor.
Bug:
26037712
Change-Id: Ie1cd442339f6d7e95ac949eb59b5da9a7a13559b
Jorim Jaggi [Wed, 9 Dec 2015 23:32:30 +0000 (15:32 -0800)]
Add multi-window entry points logging
Bug:
26116313
Change-Id: I159ca53857d382cb74ef8e49f7955946ccea93ca
Wale Ogunwale [Fri, 11 Dec 2015 22:56:37 +0000 (14:56 -0800)]
Move focus to visible behind activity when we move the home task back
Bug:
26118045
Change-Id: I106c698260b8215723ea1e50c654061464a1305f
Adarsh Fernando [Fri, 11 Dec 2015 22:59:24 +0000 (22:59 +0000)]
Merge "docs: removed duplicate "Synctrace" definition."
John Reck [Fri, 11 Dec 2015 22:55:22 +0000 (14:55 -0800)]
Fix memory leak
Change-Id: I6e17b0957e6c470fe6a230e52e4d1b30c967214a
Selim Cinek [Fri, 11 Dec 2015 22:14:39 +0000 (14:14 -0800)]
Fixed a bug where the notification header was above the guts
Change-Id: I1b32ea229bd7a7b2c6b9f572ea71167334ba8a1c
Selim Cinek [Fri, 11 Dec 2015 21:39:48 +0000 (13:39 -0800)]
Fixed a bug where systemUI would crash when swiping notifications
Bug:
26159274
Change-Id: Ie8f9e65909fbe6e3d6436e9e4aab9e29779bfd10
Makoto Onuki [Fri, 11 Dec 2015 22:51:31 +0000 (22:51 +0000)]
Merge "Avoid using the term "current" to mean "calling""
John Reck [Fri, 11 Dec 2015 22:48:56 +0000 (22:48 +0000)]
Merge "resolve merge conflicts of
f1df0f59c1 to "
John Reck [Fri, 11 Dec 2015 22:47:40 +0000 (14:47 -0800)]
resolve merge conflicts of
f1df0f59c1 to master.
Change-Id: Ia0ae0f753541f5203a4a3683721361c5e90ddae8
Makoto Onuki [Fri, 11 Dec 2015 22:29:51 +0000 (14:29 -0800)]
Avoid using the term "current" to mean "calling"
Bug
25715749
Change-Id: I98b28f1990d976c46b0eca2a2c15b7edbdda64ea
Chris Wren [Fri, 11 Dec 2015 22:25:03 +0000 (22:25 +0000)]
Merge "fix bad merge"
Chris Wren [Fri, 11 Dec 2015 22:24:17 +0000 (17:24 -0500)]
fix bad merge
Change-Id: I9d8a6135f1902956791820c696ad8b988597437f
Dimitry Ivanov [Fri, 11 Dec 2015 22:19:37 +0000 (14:19 -0800)]
Merge "Use nativeloader to load NativeActivity" am:
317456bc52
am:
e3ca5ac40d
* commit '
e3ca5ac40d96c88818d2004a688c7d06877186b2':
Use nativeloader to load NativeActivity
Selim Cinek [Fri, 11 Dec 2015 22:00:02 +0000 (22:00 +0000)]
Merge "Fixed that notification stacks could overlap weirdly"
Chris Wren [Fri, 11 Dec 2015 21:56:40 +0000 (16:56 -0500)]
unbreak the build,
plus some followon patches from Id3b0a074
Change-Id: I9f667a8d68a68d90c0d7f2fed3f28efcc6720533
Selim Cinek [Fri, 11 Dec 2015 01:10:24 +0000 (17:10 -0800)]
Fixed a bug where not enough notifications were shown on lockscreen
Change-Id: Ia1a869d12e01d0787f873399bf68b48215a65e0c
Selim Cinek [Fri, 11 Dec 2015 00:44:03 +0000 (16:44 -0800)]
Adapted the header colors to spec
Change-Id: I7e68385b99d7dd0c93b00188d6a075bfd2e9a1a5
Julia Reynolds [Fri, 11 Dec 2015 21:41:32 +0000 (21:41 +0000)]
Merge "Add importance to notification guts."
Dimitry Ivanov [Fri, 11 Dec 2015 21:38:29 +0000 (21:38 +0000)]
Merge "Use nativeloader to load NativeActivity"
Julia Reynolds [Fri, 11 Dec 2015 21:21:50 +0000 (21:21 +0000)]
Merge "use importance instead of score"
Dmitriy Ivanov [Sun, 15 Nov 2015 22:58:36 +0000 (14:58 -0800)]
Use nativeloader to load NativeActivity
System apps are the exception and they can
access internal platform libraries (this
is needed for bundled apps to work correctly).
Also fix the way NativeActivity loads the native
library to correspond to the way BaseDexClassloader
does it.
Bug: http://b/
22548808
Bub: http://b/
25777936
Change-Id: Idc94cdded182ea2cb1cbebc76c336cc3394c7ebe
(cherry picked from commit
6f06ad7df1362e9e5b252689f452bdeee2e5af46)
Chris Wren [Fri, 4 Dec 2015 20:50:51 +0000 (15:50 -0500)]
use importance instead of score
Change-Id: Id3b0a074671943b4fcabb63fe990cbfd1e46bdfd
Winson Chung [Fri, 11 Dec 2015 20:51:18 +0000 (15:51 -0500)]
Temporarily workaround rendering issues.
- Disable reusing old stack view tasks
Bug:
25998134
Change-Id: Idf74f9b371a9ae6d89f5752708ac6adb675b55a7
John Reck [Fri, 11 Dec 2015 20:48:28 +0000 (12:48 -0800)]
Merge "Fix memory leak in HWUI"
am:
85b010b826
* commit '
85b010b826129cd1a2090daa533e843b5573aea4':
Fix memory leak in HWUI
Wale Ogunwale [Fri, 11 Dec 2015 20:43:39 +0000 (20:43 +0000)]
Merge "Make fullscreen stack visible if it has visible behind activity"
Seigo Nonaka [Fri, 11 Dec 2015 20:41:33 +0000 (20:41 +0000)]
Merge "Use NotoSansCJK-Regular.ttc instead of separated font files."
Dimitry Ivanov [Fri, 11 Dec 2015 20:41:22 +0000 (12:41 -0800)]
Merge "Use nativeloader to load NativeActivity"
am:
317456bc52
* commit '
317456bc520549cbc1ac4ad102df8b0d22b22a99':
Use nativeloader to load NativeActivity
John Reck [Fri, 11 Dec 2015 20:37:36 +0000 (20:37 +0000)]
Merge "Fix memory leak in HWUI"
Dimitry Ivanov [Fri, 11 Dec 2015 20:30:32 +0000 (20:30 +0000)]
Merge "Use nativeloader to load NativeActivity"
Rob Carr [Fri, 11 Dec 2015 20:23:07 +0000 (20:23 +0000)]
Merge "Apply cropping to resizing surfaces."
Andy Hung [Fri, 11 Dec 2015 20:08:49 +0000 (20:08 +0000)]
Merge "Add Android permissions for audioserver"
Christopher Tate [Fri, 11 Dec 2015 20:03:15 +0000 (12:03 -0800)]
Don\'t back up / restore EAP network definitions am:
a89f9d93cb am:
d735fbb3af
am:
5c3370d4f8
* commit '
5c3370d4f810bd0e480d1964cf32568b9e2112a2':
Don't back up / restore EAP network definitions
Julia Reynolds [Mon, 7 Dec 2015 13:23:48 +0000 (08:23 -0500)]
Add importance to notification guts.
Note: the guts are still trucated to the height of the notification.
The slider initially shows the importance of the individual notification,
but changing the slider changes the importance for the whole group
of notifications.
Bug:
22451710
Change-Id: Id6de3aaace2bdb88a8cc5db517002dc7f0e349ae
Christopher Tate [Fri, 11 Dec 2015 19:50:22 +0000 (11:50 -0800)]
Don\'t back up / restore EAP network definitions am:
a89f9d93cb
am:
d735fbb3af
* commit '
d735fbb3af31f43a5bc99c52b61b20b7218b076f':
Don't back up / restore EAP network definitions