OSDN Git Service
Amit Mahajan [Tue, 17 May 2016 17:48:44 +0000 (17:48 +0000)]
Merge "OMADM intent sent by both system and apps." into nyc-dev
am:
65ca16ebab
* commit '
65ca16ebab701c82895a0f1bf5ba0344aff44e50':
OMADM intent sent by both system and apps.
Change-Id: Ifda48558713ea89d0d1b2de54b1abb738ca187e8
Amit Mahajan [Tue, 17 May 2016 17:41:09 +0000 (17:41 +0000)]
Merge "OMADM intent sent by both system and apps." into nyc-dev
Sid Soundararajan [Tue, 17 May 2016 17:39:19 +0000 (17:39 +0000)]
Merge "Move onStart update of recents tasks to onResume" into nyc-dev
am:
1aae32b44a
* commit '
1aae32b44abd189c905c4ac799422829ce24b186':
Move onStart update of recents tasks to onResume
Change-Id: Ifb377d9da719f2994aa34bb9bf990db9464adf4f
Sid Soundararajan [Tue, 17 May 2016 17:39:17 +0000 (17:39 +0000)]
Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev
am:
ea98d35d62
* commit '
ea98d35d62ec9e8273e5e632feec167c24a90a15':
Add an extra to HOME intent to indicate it comes form recents.
Change-Id: I683f2f9307271e6179b91097204314815aac4a8e
Robin Lee [Tue, 17 May 2016 17:39:14 +0000 (17:39 +0000)]
Merge "Make some of the UID-based VPN code reusable" into nyc-dev
am:
4920698e17
* commit '
4920698e17dc8aacd1b0743d313383a8ee1a3400':
Make some of the UID-based VPN code reusable
Change-Id: I0e5b9aa4552ee11ae5ec2d2206cc58487fb9cd4c
Sid Soundararajan [Tue, 17 May 2016 17:36:49 +0000 (17:36 +0000)]
Merge "Move onStart update of recents tasks to onResume" into nyc-dev
Sid Soundararajan [Tue, 17 May 2016 17:36:41 +0000 (17:36 +0000)]
Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev
Phil Weaver [Tue, 17 May 2016 17:36:17 +0000 (17:36 +0000)]
Merge "Hide UiAutomation#destroy as test api." into nyc-dev
am:
89d3ba72b7
* commit '
89d3ba72b7f3318d8911b136af306375051c828a':
Hide UiAutomation#destroy as test api.
Change-Id: Ie68602fc2b301430dcfa98d4b61515f2014db71a
TreeHugger Robot [Tue, 17 May 2016 17:29:59 +0000 (17:29 +0000)]
Merge "Make some of the UID-based VPN code reusable" into nyc-dev
Phil Weaver [Tue, 17 May 2016 17:26:59 +0000 (17:26 +0000)]
Merge "Hide UiAutomation#destroy as test api." into nyc-dev
Chong Zhang [Tue, 17 May 2016 17:25:09 +0000 (17:25 +0000)]
Merge "Apply final crop during surface preservation" into nyc-dev
am:
2d4d408a5b
* commit '
2d4d408a5be45b027e43fee99cc3a44b6a556c66':
Apply final crop during surface preservation
Change-Id: I9f4f6bbb2ededda8a0836d64d73fcefda2b0f946
Chong Zhang [Tue, 17 May 2016 17:17:51 +0000 (17:17 +0000)]
Merge "Apply final crop during surface preservation" into nyc-dev
Phil Weaver [Tue, 17 May 2016 17:16:46 +0000 (17:16 +0000)]
Merge "Content description for FloatingToobar overflow." into nyc-dev
am:
43141e33f7
* commit '
43141e33f7e7da5b7514549cf23f5228915f11d8':
Content description for FloatingToobar overflow.
Change-Id: I6118131870a8c3bfa51befa9973808fadfa9caf6
Phil Weaver [Tue, 17 May 2016 17:08:28 +0000 (17:08 +0000)]
Merge "Content description for FloatingToobar overflow." into nyc-dev
Steven Ng [Tue, 17 May 2016 16:38:18 +0000 (16:38 +0000)]
Merge "Enforce permission before checking OEM unlocking setting" into nyc-mr1-dev
Zoltan Szatmary-Ban [Tue, 17 May 2016 15:23:59 +0000 (15:23 +0000)]
Merge "Introduce system API to get source of user restriction" into nyc-dev
am:
690c2ea117
* commit '
690c2ea117f90b7759ac280a1c84f5966b1e7938':
Introduce system API to get source of user restriction
Change-Id: Iab98753f85774d741c5126395d56af194c8b0ca8
Zoltan Szatmary-Ban [Tue, 17 May 2016 15:16:55 +0000 (15:16 +0000)]
Merge "Introduce system API to get source of user restriction" into nyc-dev
Sergio Giro [Tue, 17 May 2016 11:10:54 +0000 (11:10 +0000)]
Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev
am:
5a68af3840
* commit '
5a68af384037f2980215dd45b91c5165c779d4e8':
ZygoteInit: warm up JCA providers during preload
Change-Id: I3cf53b5125331fc3c59183c09c79516a98a62347
Sergio Giro [Tue, 17 May 2016 11:02:18 +0000 (11:02 +0000)]
Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev
Sergio Giro [Fri, 13 May 2016 15:34:46 +0000 (16:34 +0100)]
ZygoteInit: warm up JCA providers during preload
This makes the time spent in the first call of an app to
SSLSocketFactory.getDefault() drop from ~240 ms to ~50 ms. In M
it was around ~6ms. This is due to the fact that, while instantiating
the default factory, all providers are initialized.
In order to obtain the timings above, I created an app calling
SSLSocketFactory.getDefault in onCreate and timed it
with System.currentTimeMillis() .
Bug:
28545496
Change-Id: I650d4b0435e67e481a41e02b0b538ce5cc993fa3
Robin Lee [Tue, 17 May 2016 09:24:59 +0000 (09:24 +0000)]
Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev
am:
bc73347152
* commit '
bc73347152a3562a7f957a07433d64912f4acd83':
Skip 'network may be monitored' if dying or locked
Change-Id: I8a0818074887fd20c0204098a6824ec9e9589dfa
Clara Bayarri [Tue, 17 May 2016 09:20:43 +0000 (09:20 +0000)]
Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
am:
bee2648027
* commit '
bee26480277234cb599a7131cd24ce3c5108e474':
Remove "if it succeeds" wording from requestShowKeyboardShortcuts
Change-Id: I2efdcb8828da9a455dc80911c3aa87ac7ec6eab5
Robin Lee [Tue, 17 May 2016 09:17:19 +0000 (09:17 +0000)]
Merge "Skip 'network may be monitored' if dying or locked" into nyc-dev
Clara Bayarri [Tue, 17 May 2016 09:12:35 +0000 (09:12 +0000)]
Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
Narayan Kamath [Tue, 17 May 2016 08:40:22 +0000 (08:40 +0000)]
Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev
am:
a8b4f75978
* commit '
a8b4f7597842b17b44e1ea859f218d610789e277':
PackageManager: Clear foreign-dex markers when the app is uninstalled.
Change-Id: I840fb5710bddcbdc69f7899b7432afe1f660de4e
Narayan Kamath [Tue, 17 May 2016 08:31:42 +0000 (08:31 +0000)]
Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev
David Friedman [Tue, 17 May 2016 03:33:55 +0000 (03:33 +0000)]
Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am:
bf56921d35 am:
86b5f72636
am:
c19cf44966
* commit '
c19cf449664e985f0bb07833daadf533ec0dfa1c':
Docs: CL for continuing work on tactically merged N-DP3 docs.
Change-Id: I63ce9bb629c733bc494e27868727a79f4471af9c
David Friedman [Tue, 17 May 2016 03:29:11 +0000 (03:29 +0000)]
Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am:
bf56921d35
am:
86b5f72636
* commit '
86b5f726368c873c8503ed7a8042cfa954f5e1a0':
Docs: CL for continuing work on tactically merged N-DP3 docs.
Change-Id: I83923831a50a94f46d05e18cfc4d69c68b2e58ed
David Friedman [Tue, 17 May 2016 03:23:46 +0000 (03:23 +0000)]
Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs
am:
bf56921d35
* commit '
bf56921d3527ad0652f4224b422dd611ec1a6fee':
Docs: CL for continuing work on tactically merged N-DP3 docs.
Change-Id: I8150c709818232cf24e4d967de45aeb1bd4c2956
David Friedman [Tue, 17 May 2016 03:17:40 +0000 (03:17 +0000)]
Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs
David Friedman [Fri, 13 May 2016 17:03:52 +0000 (10:03 -0700)]
Docs: CL for continuing work on tactically merged N-DP3 docs.
This CL continues the work from ag/
1036623 and ag/
1036124.
Change-Id: Ic1e026ed9f53a389a0435c2b8e21edfe9ef635c4
Chong Zhang [Tue, 17 May 2016 01:25:45 +0000 (18:25 -0700)]
Apply final crop during surface preservation
Apply stack crop to the preserved surface so that it doesn't stick over
the dock divider.
bug:
28567495
Change-Id: Ib7a9d8ec82a7752ecbef60a86f441e35e16ac877
Christopher Tate [Tue, 17 May 2016 01:03:59 +0000 (01:03 +0000)]
Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev
am:
11d9586117
* commit '
11d9586117e983e36b2467bcb436200268cd0933':
Sysconfig define a whitelist of permitted backup transports
Change-Id: I7c894dd6dc494dc5c02ba9e9676b53b0acc281d4
Wale Ogunwale [Tue, 17 May 2016 00:59:36 +0000 (00:59 +0000)]
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
am:
b406dd20ee
* commit '
b406dd20eee28eedb8e9f330a0459d630c026515':
Fixed bugs with starting windows when displayng forcedResized activity
Change-Id: I81250af945c186fbb687bc15ec03a85a019bd6e3
Chris Tate [Tue, 17 May 2016 00:56:48 +0000 (00:56 +0000)]
Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev
TreeHugger Robot [Tue, 17 May 2016 00:51:40 +0000 (00:51 +0000)]
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
Wale Ogunwale [Tue, 17 May 2016 00:38:50 +0000 (00:38 +0000)]
Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev
am:
fc932b9d69
* commit '
fc932b9d699e5797fbbfac3ec09a789419ade269':
Update configuration of all visible activities in a stack when resizing
Change-Id: I2211b2a8eb03a692bdbc6124f0103340c39c4adc
Amith Yamasani [Tue, 17 May 2016 00:34:16 +0000 (00:34 +0000)]
Merge "Allow Shell to change component enabled state" into nyc-dev
am:
19b34eccfe
* commit '
19b34eccfee9d14e6888c4813cc369bd4b3a7e81':
Allow Shell to change component enabled state
Change-Id: I8b472bf3149b1e721ea90a8a6fed12549e3f1510
TreeHugger Robot [Tue, 17 May 2016 00:29:03 +0000 (00:29 +0000)]
Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev
Amith Yamasani [Tue, 17 May 2016 00:27:54 +0000 (00:27 +0000)]
Merge "Allow Shell to change component enabled state" into nyc-dev
Chris Craik [Tue, 17 May 2016 00:07:54 +0000 (00:07 +0000)]
Merge "Fix hw layer overdraw/update visualization" into nyc-dev
am:
189e3e5ec5
* commit '
189e3e5ec5b698f1062fb98692fa75d3750148e0':
Fix hw layer overdraw/update visualization
Change-Id: I4e788e8a83fa02881ca18d82dc2371d5bf43284c
TreeHugger Robot [Mon, 16 May 2016 23:58:27 +0000 (23:58 +0000)]
Merge "Fix hw layer overdraw/update visualization" into nyc-dev
Jorim Jaggi [Mon, 16 May 2016 23:27:56 +0000 (23:27 +0000)]
Handle multi-window for inset hint
am:
23bf5462f0
* commit '
23bf5462f05b33ce4390d8370520e43b74dbec09':
Handle multi-window for inset hint
Change-Id: I67d202891330ba78b6fbe62510261cc7f1449b42
Wale Ogunwale [Fri, 13 May 2016 22:37:13 +0000 (15:37 -0700)]
Fixed bugs with starting windows when displayng forcedResized activity
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.
Bug:
28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
Tim Murray [Mon, 16 May 2016 23:22:39 +0000 (23:22 +0000)]
Merge "Make persistent apps become top correctly." into nyc-dev
am:
29af3cab29
* commit '
29af3cab293dc7a19ca3b387c5507e521f66d0b7':
Make persistent apps become top correctly.
Change-Id: Ic022afa3fa2004735b371dce4738da8d7dfeb008
Jorim Jaggi [Fri, 13 May 2016 22:24:39 +0000 (15:24 -0700)]
Handle multi-window for inset hint
We need to incorporate task bounds when calculating the inset hint
so we don't specify something wrong to the client which we correct
immediately after.
Bug:
28697105
Change-Id: I23cec7d6cc62a4d982e0796a867e803d4cce0803
Wale Ogunwale [Mon, 16 May 2016 22:12:03 +0000 (15:12 -0700)]
Update configuration of all visible activities in a stack when resizing
Previously we were only updating configuration for the top activity in
the stack during resizing. This caused an activity behind the top
translucent activity to continue to display in the old configuration
and also get relaunched without window preservation when the top
translucent activity is finished.
We now make sure all activities at all below a translucent activity
have their configuration updated during resizing.
Bug:
28762547
Change-Id: I0926ac6db088cdf3f6a225c552dbfbe944830f68
TreeHugger Robot [Mon, 16 May 2016 23:13:24 +0000 (23:13 +0000)]
Merge "Make persistent apps become top correctly." into nyc-dev
Anthony Hugh [Mon, 16 May 2016 23:00:52 +0000 (23:00 +0000)]
Merge "Change Priority Only mode defaults on watches" into nyc-mr1-dev
Hans Boehm [Mon, 16 May 2016 22:57:14 +0000 (22:57 +0000)]
Merge "Clear more native pointers in finalizers" into nyc-dev
am:
53c33d9701
* commit '
53c33d97013ad10a42d9b37fe77884f596250109':
Clear more native pointers in finalizers
Change-Id: I0e28a59e0f2d60b38a5e2bdd55bbd72ec1da42d9
Svetoslav Ganov [Mon, 16 May 2016 22:48:35 +0000 (22:48 +0000)]
Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev
am:
008d73bd5b
* commit '
008d73bd5b3ca4b1b7a8af61957759d65dd67e3b':
Ensure app op restrictions reset when the app that set them dies.
Change-Id: Iebbe27690aeac898807c13ef05c730697dbb406a
Dirk Dougherty [Mon, 16 May 2016 22:48:33 +0000 (22:48 +0000)]
Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am:
0a957d5aa2 am:
b33f36497d am:
a4101e6693
am:
de84a27872
* commit '
de84a27872a9eca52d0703d602335f558021c10e':
Update default image for n preview docs. Update tools resources.
Change-Id: I2b2c575fff29152e32b6ad46005b3e27fa865f11
Scott Main [Mon, 16 May 2016 22:48:30 +0000 (22:48 +0000)]
Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am:
a0acf474e9 am:
592b36a326 am:
0b019a3d02
am:
1d145e7d2b
* commit '
1d145e7d2b4b10ba0b9330766e3975802e5aa1e4':
Avoid weird line wrapping by removing columns and forcing line breaks between the links
Change-Id: I67591e599c9d0def077ad2a8b48cd53a78b785c7
Hans Boehm [Mon, 16 May 2016 22:45:02 +0000 (22:45 +0000)]
Merge "Clear more native pointers in finalizers" into nyc-dev
Jaewan Kim [Mon, 16 May 2016 22:43:01 +0000 (22:43 +0000)]
Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev
am:
174aa3346c
* commit '
174aa3346c06341d13f287c72ccd9ec47fce5987':
Workaround that Recents is shown again after an activity is PIPed
Change-Id: I8a2a7daeebeb37817a36d12e52db86912dce2186
Svetoslav Ganov [Mon, 16 May 2016 22:42:48 +0000 (22:42 +0000)]
Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev
Dirk Dougherty [Mon, 16 May 2016 22:41:55 +0000 (22:41 +0000)]
Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am:
0a957d5aa2 am:
b33f36497d
am:
a4101e6693
* commit '
a4101e66933fd5acb882bfc0311f3f4b5cbd5b11':
Update default image for n preview docs. Update tools resources.
Change-Id: I859659905ab0bdd7e16a2406542c0cac69e1f4d7
smain@google.com [Mon, 16 May 2016 22:41:44 +0000 (22:41 +0000)]
Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am:
a0acf474e9 am:
592b36a326
am:
0b019a3d02
* commit '
0b019a3d028990a9832188d3ef2c9540e5d37f40':
Avoid weird line wrapping by removing columns and forcing line breaks between the links
Change-Id: Ifba667194d2e2f04a9824945d5100cdea01a9c77
Jaewan Kim [Mon, 16 May 2016 22:38:22 +0000 (22:38 +0000)]
Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev
Dirk Dougherty [Mon, 16 May 2016 22:35:33 +0000 (22:35 +0000)]
Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am:
0a957d5aa2
am:
b33f36497d
* commit '
b33f36497dbc7265ee16323ee6c0281690ca3221':
Update default image for n preview docs. Update tools resources.
Change-Id: I1ed7ac4ecf30538252d4b277b1baf93ec61e4835
Scott Main [Mon, 16 May 2016 22:35:30 +0000 (22:35 +0000)]
Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am:
a0acf474e9
am:
592b36a326
* commit '
592b36a326216cd2442c47da9608ca2afd7e4d16':
Avoid weird line wrapping by removing columns and forcing line breaks between the links
Change-Id: I54b1282f6ef2d92251a4624c8f439499831af1a6
Svetoslav Ganov [Sat, 14 May 2016 00:08:16 +0000 (17:08 -0700)]
Ensure app op restrictions reset when the app that set them dies.
We were not keeping track when an app that set an app op restriction
dies to clean up after that. As a result we may end up with stale
restrictions that will be there until the device reoots - not cool.
This change adds remote binder death tracking and simplifies the
code as adding the formed would have made more complex.
bug:
28770536
Change-Id: I7dcaafba2354843a0cdf0206ab1f96625edc5120
Jorim Jaggi [Mon, 16 May 2016 22:31:32 +0000 (22:31 +0000)]
Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev
am:
8e30eb3a7f
* commit '
8e30eb3a7f81729065bad6d971bf414f995410df':
Fix transition delay tracking when starting activity from recents
Change-Id: I1b0a85c1fe5ce607e7bb46da03d27f77abe498db
Dirk Dougherty [Mon, 16 May 2016 22:31:30 +0000 (22:31 +0000)]
Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs
am:
0a957d5aa2
* commit '
0a957d5aa28920f8854070676955f941e3ae6726':
Update default image for n preview docs. Update tools resources.
Change-Id: I3fa206d3bfc74d20cb74e19f0d084d62fb47c0e2
Dianne Hackborn [Mon, 16 May 2016 22:31:25 +0000 (22:31 +0000)]
Merge "Fix issue #
28794831: meminfo considers cached processes to be services" into nyc-dev
am:
0cb1cc74b8
* commit '
0cb1cc74b851f995110b8231f754c9f84122c816':
Fix issue #
28794831: meminfo considers cached processes to be services
Change-Id: I2d9ab20344f982e97d91422e89e56a27420233bd
smain@google.com [Mon, 16 May 2016 22:31:22 +0000 (22:31 +0000)]
Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs
am:
a0acf474e9
* commit '
a0acf474e9db6e1a444d7e48b520b48ded8fcdce':
Avoid weird line wrapping by removing columns and forcing line breaks between the links
Change-Id: I337e5167eb9191f674c6cc397d61925c334c3b72
Dirk Dougherty [Mon, 16 May 2016 22:27:47 +0000 (22:27 +0000)]
Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs
TreeHugger Robot [Mon, 16 May 2016 22:27:38 +0000 (22:27 +0000)]
Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev
Dianne Hackborn [Mon, 16 May 2016 22:26:12 +0000 (22:26 +0000)]
Merge "Fix issue #
28794831: meminfo considers cached processes to be services" into nyc-dev
Scott Main [Mon, 16 May 2016 22:25:49 +0000 (22:25 +0000)]
Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs
Billy Lamberta [Mon, 16 May 2016 22:23:55 +0000 (22:23 +0000)]
Merge "docs: work minisite" into mnc-io-docs am:
8f740bea13 am:
51ceb1bad1
am:
a0a34f6017
* commit '
a0a34f6017287d466e90a27f82ff8cf4c91c0663':
docs: work minisite
Change-Id: I2152083326c271ebd9adc5eea7a072db9b7aa080
Felipe Leme [Mon, 16 May 2016 22:23:46 +0000 (22:23 +0000)]
Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev
am:
522787f39a
* commit '
522787f39a759cf8af8438641fa8df7470a1b959':
Documented return value of getRestrictBackgroundStatus().
Change-Id: I1187ffeeb42b61329674ca022735efa08c7e9d98
smain@google.com [Mon, 16 May 2016 22:22:17 +0000 (15:22 -0700)]
Avoid weird line wrapping by removing columns and forcing line breaks between the links
Change-Id: I797b46d75643ce2491d47c95599164022ce451a7
Michael Kwan [Mon, 16 May 2016 22:21:29 +0000 (22:21 +0000)]
Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev
Billy Lamberta [Mon, 16 May 2016 22:19:41 +0000 (22:19 +0000)]
Merge "docs: work minisite" into mnc-io-docs am:
8f740bea13
am:
51ceb1bad1
* commit '
51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a':
docs: work minisite
Change-Id: Ieac1a9a571bfe6ef94663623f5715d1b205dd242
Amith Yamasani [Fri, 13 May 2016 18:13:16 +0000 (11:13 -0700)]
Allow Shell to change component enabled state
But make sure that we don't allow Shell or other apps
to disable an active profile or device owner.
Also limit exactly what states Shell can switch apps
between, similar to Settings UI.
This is required for some CTS tests
Bug:
27924655
Change-Id: I958f0d1de7f0bc1f5a0cbf853d57dfdeb2f9ad59
TreeHugger Robot [Mon, 16 May 2016 22:17:41 +0000 (22:17 +0000)]
Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev
Billy Lamberta [Mon, 16 May 2016 22:12:37 +0000 (22:12 +0000)]
Merge "docs: work minisite" into mnc-io-docs
am:
8f740bea13
* commit '
8f740bea131ca0234fee9dce273f23c6f21ddf2f':
docs: work minisite
Change-Id: Id0a4c1be427a131f1766f3452bca1b2f90365981
Philip P. Moltmann [Mon, 16 May 2016 22:09:32 +0000 (22:09 +0000)]
Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev
am:
5bfaa9c128
* commit '
5bfaa9c1283e05567cd88d35f13ae6872dd687e2':
Adjust PrintRecommendationService for Konica Minolta.
Change-Id: Icd5edb72267ac24f700a9b171f97455f6319b74a
Fyodor Kupolov [Mon, 16 May 2016 22:09:28 +0000 (22:09 +0000)]
Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev
am:
6eb923cb64
* commit '
6eb923cb64f38dcb23fd3ca15793a13a900b1630':
Delay grantDefaultPermissions until user's first start
Change-Id: I16a8505e69e06faf9932c9a173ef8c07ebfddb59
Billy Lamberta [Mon, 16 May 2016 22:05:58 +0000 (22:05 +0000)]
Merge "docs: work minisite" into mnc-io-docs
Philip P. Moltmann [Mon, 16 May 2016 22:02:46 +0000 (22:02 +0000)]
Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev
TreeHugger Robot [Mon, 16 May 2016 22:01:14 +0000 (22:01 +0000)]
Merge "Delay grantDefaultPermissions until user's first start" into nyc-dev
Philip P. Moltmann [Mon, 16 May 2016 22:01:03 +0000 (22:01 +0000)]
Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev
am:
11e215bc45
* commit '
11e215bc45de37102977462c9ced878c130ff74a':
Clear state when ProgressMessageCtrl. is canceled
Change-Id: Ic5e24461b1891d37363195de6bff8d55fba95f3f
Sid Soundararajan [Mon, 16 May 2016 21:55:08 +0000 (14:55 -0700)]
Add an extra to HOME intent to indicate it comes form recents.
This allows the launcher to know how to handle HOME press properly
when a video is playing in the background. Without this, the Launcher
dismisses it's UI.
Launcher CL: https://googleplex-android-review.git.corp.google.com/#/c/
1043435/
BUG:
28173127
Change-Id: Iab0c5013fc41f79a6fd45f49904edd0d0f9c17ff
Tim Murray [Mon, 16 May 2016 21:53:29 +0000 (14:53 -0700)]
Make persistent apps become top correctly.
Sometimes, a persistent app should be the top app (recents). Make sure
such an app can use the top-app cpuset.
bug
28317812
bug
28794389
Change-Id: I756cec3fbab8cc552a6d90c007aa2e07f6b78dbc
Jorim Jaggi [Mon, 16 May 2016 21:51:23 +0000 (21:51 +0000)]
Don\'t throw away wallpaper bitmap just because we are hidden.
am:
ed0e1a68a4
* commit '
ed0e1a68a437979e399724ca17f422add80bd0e4':
Don't throw away wallpaper bitmap just because we are hidden.
Change-Id: Id1af47665ea63354c6f6e6f8f01761b7c917d2ad
Philip P. Moltmann [Mon, 16 May 2016 21:43:12 +0000 (21:43 +0000)]
Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev
Julia Reynolds [Mon, 16 May 2016 21:41:52 +0000 (21:41 +0000)]
Merge "Adjust spacing." into nyc-dev
am:
45626c448d
* commit '
45626c448d63b7a3c0e86d7b03043271f7fa68af':
Adjust spacing.
Change-Id: I9368d77b3d6d630d53a8a9beb6f5d20665268930
Anthony Hugh [Sat, 14 May 2016 01:26:44 +0000 (18:26 -0700)]
Change Priority Only mode defaults on watches
Changes Priority Only mode defaults on watches to the following:
Allow starred contacts to go through only. Repeated calls on.
Calls, messages, reminders, events off
BUG:
28640779
Change-Id: I89d57de58a8c3bb62432f97e96b60c653745d303
Jorim Jaggi [Sat, 14 May 2016 00:45:41 +0000 (17:45 -0700)]
Don't throw away wallpaper bitmap just because we are hidden.
TRIM_MEMORY_UI_HIDDEN > TRIM_MEMORY_RUNNING constants, so we only
need to throw away the wallpaper if we are actually running low on
memory.
Bug:
28769940
Change-Id: I8aa27d081bbcc2eff553e9420b2b9b0920f3781f
Julia Reynolds [Mon, 16 May 2016 21:34:14 +0000 (21:34 +0000)]
Merge "Adjust spacing." into nyc-dev
Andrew Solovay [Mon, 16 May 2016 21:30:54 +0000 (21:30 +0000)]
docs: Minor permissions phrasing tweak am:
9acd851ee6 am:
072b6fb839 am:
8804495bff
am:
3228255e77
* commit '
3228255e772e026da7d00cb914e76e454830328d':
docs: Minor permissions phrasing tweak
Change-Id: Iaa59ba0131a79a17d408d0a42ef15a190b0d972c
Andrew Solovay [Mon, 16 May 2016 21:26:12 +0000 (21:26 +0000)]
Merge "docs: Removed note that GET_ACCOUNTS was deprecated am:
cc80393d94 am:
af9dc9292b am:
be2b224d80" into nyc-dev
am:
a586b078b3
* commit '
a586b078b356b4a2da6b2d9b1135c6a41b85703e':
docs: Removed note that GET_ACCOUNTS was deprecated
Change-Id: I1e90ff314935950c751b1f42f637806f01054e8f
Vladislav Kaznacheev [Mon, 16 May 2016 21:26:09 +0000 (21:26 +0000)]
Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev
am:
a423ec52ac
* commit '
a423ec52ac427e5bdbd12aac21ef75eff7d96140':
Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.
Change-Id: I5d87956bf0fe48acf66d577d8531e2669ec5b001
Andrew Solovay [Mon, 16 May 2016 21:26:07 +0000 (21:26 +0000)]
docs: Minor permissions phrasing tweak am:
9acd851ee6 am:
072b6fb839
am:
8804495bff
* commit '
8804495bffbbffa0abe8cd148ba1ea3c58e20be0':
docs: Minor permissions phrasing tweak
Change-Id: I348ecb4cbe9301eccd78c6e2f87b1eb016627d5d
Android Build Merger (Role) [Mon, 16 May 2016 21:23:21 +0000 (21:23 +0000)]
Merge "docs: Removed note that GET_ACCOUNTS was deprecated am:
cc80393d94 am:
af9dc9292b am:
be2b224d80" into nyc-dev
Andrew Solovay [Mon, 16 May 2016 21:22:55 +0000 (21:22 +0000)]
docs: Removed note that GET_ACCOUNTS was deprecated am:
cc80393d94 am:
af9dc9292b
am:
be2b224d80
* commit '
be2b224d80554906aa03c57f6096fa51afb48fdf':
docs: Removed note that GET_ACCOUNTS was deprecated
Change-Id: Ic6ffde061f37bd74e45a3f60de8a5bb6aa241c58
Sanket Padawe [Mon, 16 May 2016 21:22:19 +0000 (21:22 +0000)]
Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev
am:
8c60dbe3ca
* commit '
8c60dbe3caae6bdfc202f17455526cb16cd46439':
Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.
Change-Id: I737738186f863b6fdbb034c878a964f54d7b0369
TreeHugger Robot [Mon, 16 May 2016 21:21:57 +0000 (21:21 +0000)]
Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev
OSDN Git Service
