OSDN Git Service
Erik Wolsheimer [Tue, 17 Nov 2015 23:13:36 +0000 (23:13 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Erik Wolsheimer [Tue, 17 Nov 2015 23:13:07 +0000 (23:13 +0000)]
Erik Wolsheimer [Tue, 17 Nov 2015 23:11:59 +0000 (23:11 +0000)]
Mark Salyzyn [Tue, 17 Nov 2015 23:10:30 +0000 (23:10 +0000)]
Merge "Revert "jni: is loggable speedup, not within signal"" am:
3c54ed00f3 am:
c53dad8d16
am:
45f88d02de
* commit '
45f88d02deb8b78f72b7315b5d42567639ad7ece':
Revert "jni: is loggable speedup, not within signal"
Geoff Mendal [Tue, 17 Nov 2015 23:09:06 +0000 (23:09 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours am:
a6c50551cd -s ours
am:
c94a189e5f -s ours
* commit '
c94a189e5f9ca87fdd314cae3c24c50aacf231dc':
Calin Juravle [Tue, 17 Nov 2015 23:07:36 +0000 (23:07 +0000)]
Merge "Remove obsolete profile handling from AndroidRuntime." am:
360e95a90d am:
e20120031f
am:
c3a70ce001
* commit '
c3a70ce0015e9117268040378c6adb6239ead897':
Remove obsolete profile handling from AndroidRuntime.
Chris Craik [Tue, 17 Nov 2015 22:53:40 +0000 (22:53 +0000)]
Merge "Add temporary layer alpha fallback to OpReorderer"
Chris Craik [Mon, 16 Nov 2015 18:27:59 +0000 (10:27 -0800)]
Add temporary layer alpha fallback to OpReorderer
Also adds logic to clip temporary layers to viewport both for
efficiency and to allow large ones (such as the fallback case) to fit
in max texture size.
Change-Id: Iee51495220f5ca1dc7e6f5fd3615db2e896efd74
Julia Reynolds [Tue, 17 Nov 2015 20:36:30 +0000 (15:36 -0500)]
Notifications can only have 1 topic.
Change-Id: Id0ab6bca352b969431d4ba68167074e514a98980
Makoto Onuki [Tue, 17 Nov 2015 22:11:20 +0000 (22:11 +0000)]
Merge "Allow PO to clear password even if the same apk has DA"
Makoto Onuki [Tue, 17 Nov 2015 21:54:02 +0000 (13:54 -0800)]
Allow PO to clear password even if the same apk has DA
Bug
25645900
Change-Id: I7d2d9fbf6a4dc65ac63fb14e6ee6b9abc1f1c0e7
Alan Viverette [Tue, 17 Nov 2015 21:44:14 +0000 (21:44 +0000)]
Merge "Use correct rounding in View for potentially negative values"
Wale Ogunwale [Tue, 17 Nov 2015 21:26:59 +0000 (21:26 +0000)]
Merge changes Id86e9773,I682afe1b
* changes:
Moved BackdropFrameRenderer from NonClientDecorView to its own class file
Moved management of NonClientDecorView from PhoneWindow to DecorView
Julia Reynolds [Tue, 17 Nov 2015 21:16:05 +0000 (21:16 +0000)]
Merge "Allow DND mode to suppress visual interruptions."
Julia Reynolds [Thu, 5 Nov 2015 21:48:55 +0000 (16:48 -0500)]
Allow DND mode to suppress visual interruptions.
Bug:
25423508
Change-Id: Idd8242e4bc00a749dbe0b5503c458375fc017072
Deepanshu Gupta [Tue, 17 Nov 2015 20:43:02 +0000 (20:43 +0000)]
LayoutLib: IntelliJ changed project files. am:
22931224d9 am:
66840955d8 am:
e45abdb126
am:
606e5a0c56
* commit '
606e5a0c562a461919e90ddf1e41036d926c9716':
LayoutLib: IntelliJ changed project files.
Michael Wright [Tue, 17 Nov 2015 20:41:30 +0000 (20:41 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71 am:
313c7b2ee0 am:
c73255d8ab am:
053f241cc7 am:
e2af036719 am:
cd00ba1a71
am:
526c98cb7f -s ours
* commit '
526c98cb7fa1e1bf7464e4cfe87115569d2a9dcc':
DO NOT MERGE. Prevent recents from coming up when in SUW
Deepanshu Gupta [Tue, 17 Nov 2015 20:24:20 +0000 (20:24 +0000)]
LayoutLib: IntelliJ changed project files. am:
22931224d9 am:
66840955d8
am:
e45abdb126
* commit '
e45abdb1267781c2f3f4fa65cb8771c5d01d0956':
LayoutLib: IntelliJ changed project files.
Wale Ogunwale [Tue, 17 Nov 2015 19:26:56 +0000 (11:26 -0800)]
Moved BackdropFrameRenderer from NonClientDecorView to its own class file
Bug:
24810450
Change-Id: Id86e97733161499bbc59617433792f5ddc4e7f9e
Deepanshu Gupta [Tue, 17 Nov 2015 20:06:20 +0000 (20:06 +0000)]
LayoutLib: IntelliJ changed project files. am:
22931224d9
am:
66840955d8
* commit '
66840955d817b2ca42a4a573dd9186b5ad5b25aa':
LayoutLib: IntelliJ changed project files.
Deepanshu Gupta [Tue, 17 Nov 2015 19:51:52 +0000 (19:51 +0000)]
LayoutLib: IntelliJ changed project files.
am:
22931224d9
* commit '
22931224d9a9845d316a9ea30e56557bec0b2e45':
LayoutLib: IntelliJ changed project files.
Michael Wright [Tue, 17 Nov 2015 19:51:50 +0000 (19:51 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71 am:
313c7b2ee0 am:
c73255d8ab am:
053f241cc7 am:
e2af036719
am:
cd00ba1a71
* commit '
cd00ba1a71bbb9edf92a0cc5def975be86207e4e':
DO NOT MERGE. Prevent recents from coming up when in SUW
Winson Chung [Tue, 17 Nov 2015 19:51:02 +0000 (19:51 +0000)]
Merge "Fixing some Recents landscape issues."
Alan Viverette [Tue, 17 Nov 2015 19:47:31 +0000 (19:47 +0000)]
Merge "Update the TimePicker hour format when toggling 24-hour mode"
Deepanshu Gupta [Tue, 17 Nov 2015 19:37:35 +0000 (11:37 -0800)]
LayoutLib: IntelliJ changed project files.
Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3
Winson [Sat, 14 Nov 2015 00:10:01 +0000 (16:10 -0800)]
Fixing some Recents landscape issues.
- Tasks were drawing under the navigation in landscape since we did
not account for the nav bar space
- Fixing issue with tiny tasks in landscape
- Fixing issue where pooled views were not being measured or laid out
after resizing.
- Fixing issue where the stack scroll would have out of bounds when
tasks were resized (we animate them into bounds)
Change-Id: Id301dc6891e7ff2692cb040a7df1a5a854ac84a3
Winson [Thu, 12 Nov 2015 19:32:21 +0000 (11:32 -0800)]
Adding tuner param to enable fast-toggling.
- Moving constants to a more explicit flags class, which also handles
tuner changes.
- Removing some unused flags
Change-Id: If370581d431784f606c4b8d0c0face5b9a4b9fad
Michael Wright [Tue, 17 Nov 2015 19:14:01 +0000 (19:14 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71 am:
313c7b2ee0 am:
c73255d8ab am:
053f241cc7
am:
e2af036719
* commit '
e2af0367193332e340a759eae7dc37c5342fbc01':
DO NOT MERGE. Prevent recents from coming up when in SUW
Dianne Hackborn [Tue, 17 Nov 2015 19:13:32 +0000 (19:13 +0000)]
Merge "Initial stab at background check."
Svetoslav Ganov [Tue, 17 Nov 2015 19:08:34 +0000 (19:08 +0000)]
Merge "Don't grant runtime permissions on install to legacy apps"
Michael Wright [Tue, 17 Nov 2015 19:05:20 +0000 (19:05 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71 am:
313c7b2ee0 am:
c73255d8ab
am:
053f241cc7
* commit '
053f241cc7cc23f41fde42c6a0c9ecf2f8cd2830':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 18:57:03 +0000 (18:57 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71 am:
313c7b2ee0
am:
c73255d8ab
* commit '
c73255d8abb343dc88ea56f7f8f5d2fd3dcfeb63':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 18:49:32 +0000 (18:49 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71
am:
313c7b2ee0
* commit '
313c7b2ee07ea74ac184294e4a6133a813bfcabf':
DO NOT MERGE. Prevent recents from coming up when in SUW
Wale Ogunwale [Tue, 17 Nov 2015 18:45:06 +0000 (10:45 -0800)]
Moved management of NonClientDecorView from PhoneWindow to DecorView
Bug:
24810450
Change-Id: I682afe1b15cb8ec1f98b38b88a499243d4c6c8a3
Michael Wright [Tue, 17 Nov 2015 18:40:21 +0000 (18:40 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
am:
4aa1e48a71
* commit '
4aa1e48a71df78fed20ac4105a2bd97ff04addf7':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 18:33:38 +0000 (18:33 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
Alan Treadway [Tue, 17 Nov 2015 18:32:42 +0000 (18:32 +0000)]
Merge "Fix edge-cases for split-user provisioning cases."
Filip Gruszczynski [Tue, 17 Nov 2015 18:19:15 +0000 (18:19 +0000)]
Merge "Synchronize recents to freeform transition."
Svet Ganov [Tue, 17 Nov 2015 15:50:45 +0000 (07:50 -0800)]
Don't grant runtime permissions on install to legacy apps
bug:
25329324
Change-Id: Ia020b96eaef8895f0c2a13bddacfa7a053c56d32
Mitchell Wills [Tue, 17 Nov 2015 18:05:58 +0000 (18:05 +0000)]
Merge "Expose gscan exponential backoff API"
Filip Gruszczynski [Sun, 15 Nov 2015 18:58:57 +0000 (10:58 -0800)]
Synchronize recents to freeform transition.
Recents to freeform animation must hang on the first frame and inform
Recents to hide its views. This mirrors the transition from freeform
to Recents, where the animation needs to hang on the last frame.
We need a special window flag for recents to force a redraw after the
animation launches. At this point Recents will become not visible
from the perspective of the activity manager, which would prevent
further drawing. We make recents ignore that and instead depend on
window visibility which will change after recents exit animation
finishes.
Bug:
24913782
Change-Id: Ief743b7e6fcebb3d8789d4745fb122ac607c1cf0
Alan Treadway [Tue, 17 Nov 2015 11:56:07 +0000 (11:56 +0000)]
Fix edge-cases for split-user provisioning cases.
Split-user systems will allow for combinations of management modes,
specifically managed-{user,profile} on systems with a device-owner.
Bug:
25671630
Bug:
25680065
Change-Id: I5716f55eb6c8318129b4614adc22897d53901bee
Wale Ogunwale [Tue, 17 Nov 2015 17:35:34 +0000 (17:35 +0000)]
Merge "Move DecorView out of PhoneWindow into its own class file."
Wale Ogunwale [Tue, 17 Nov 2015 17:18:15 +0000 (09:18 -0800)]
Move DecorView out of PhoneWindow into its own class file.
Bug:
24810450
Change-Id: Ifa4e01517c80cec6d9a5b1051e5ccb7bab94a470
Paul Stewart [Tue, 17 Nov 2015 17:13:23 +0000 (17:13 +0000)]
Merge "WifiEnterpriseConfiguration: Do not print credentials in toString"
Bryce Lee [Tue, 17 Nov 2015 16:41:39 +0000 (16:41 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3 am:
e2861471b9 am:
52d93db91d
am:
17ffebf8c8
* commit '
17ffebf8c802ccc5ee6db36aad88e560297d6c33':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:35:14 +0000 (16:35 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3 am:
e2861471b9
am:
52d93db91d
* commit '
52d93db91dcf883f236c7b1e75d1dd4b2421a1d3':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:28:47 +0000 (16:28 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3
am:
e2861471b9
* commit '
e2861471b906d94b1211beeee824ae43b7e931c3':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:21:59 +0000 (16:21 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903
am:
0fa22022a3
* commit '
0fa22022a378db8de881af397b73d28b0939e5ff':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:14:55 +0000 (16:14 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
am:
cb8749c903
* commit '
cb8749c903d29fd04944550b5f34cc6120b69232':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:08:44 +0000 (16:08 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
Alan Viverette [Tue, 17 Nov 2015 14:47:11 +0000 (09:47 -0500)]
APIs for querying and controlling display magnification
Also separates magnification state and touch event handling. Moves
callbacks for window manager changes and display state changes into
the magnification controller.
Bug:
22718911
Change-Id: I3a8ba060a07d8f1f51856855a5f85601766fd45d
Nicolas Geoffray [Tue, 17 Nov 2015 12:26:01 +0000 (12:26 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
Daichi Hirono [Tue, 17 Nov 2015 06:47:45 +0000 (06:47 +0000)]
Merge "Start using MtpDatabase in DocumentLoader."
Daichi Hirono [Mon, 16 Nov 2015 04:01:31 +0000 (13:01 +0900)]
Start using MtpDatabase in DocumentLoader.
BUG=
25704514
Change-Id: I4d9247c148679ee7e40a1a03443e4c0299b1e44d
Sungsoo Lim [Tue, 17 Nov 2015 06:35:16 +0000 (06:35 +0000)]
Merge "Make TvContentRating.contains() public"
Filip Gruszczynski [Tue, 17 Nov 2015 05:07:56 +0000 (05:07 +0000)]
Merge "Don't animate move triggered by resizing using dock divider."
Filip Gruszczynski [Mon, 16 Nov 2015 04:36:38 +0000 (20:36 -0800)]
Don't animate move triggered by resizing using dock divider.
Also includes some small, nice refactoring:
* move code that sets the move animation into WindowStateAnimator;
* a few fields can be made private in WindowStateAnimator this way;
* one boolean flag in WindowStateAnimator popped out as unused after
being privatized, so could be deleted.
Bug:
25690109
Change-Id: I8144114244892c4f27aff21455e8e76eddbd039f
Joe LaPenna [Tue, 17 Nov 2015 04:02:41 +0000 (04:02 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours am:
7f0a1556ec -s ours am:
dbe1804f58 -s ours am:
9cb81aa210 -s ours
am:
6412751108 -s ours
* commit '
6412751108070a3e591546d4bc6e660fea52b49f':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Sanket Padawe [Tue, 17 Nov 2015 04:01:10 +0000 (04:01 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466 am:
ccfcb636ae am:
63e6aa8571 am:
32a190bd78 am:
7bb34d7517 am:
fc8f7cee01
am:
5c63189f4a
* commit '
5c63189f4a83c71d6c7a8e705e5560cb353e4b69':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 03:59:41 +0000 (03:59 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a am:
80bd5e6fd7 am:
9f275ec3fd
am:
d00380a560
* commit '
d00380a560dff6a2237086f2f4c96313785ce93f':
WindowDecorActionBar name change fix.
Michael Kwan [Tue, 17 Nov 2015 03:58:01 +0000 (03:58 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours am:
b0aae584ea -s ours am:
2c8f3734af -s ours
am:
03f62d7af2 -s ours
* commit '
03f62d7af2cd6618ed775b4183fa5cb3a274e01d':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Rom Lemarchand [Tue, 17 Nov 2015 03:48:50 +0000 (19:48 -0800)]
resolve merge conflicts of
152d353e87 to master.
Change-Id: Ida54b932d0a077d6eaeb2418a6cbf58f96035fff
Joe LaPenna [Tue, 17 Nov 2015 03:11:51 +0000 (03:11 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours am:
7f0a1556ec -s ours am:
dbe1804f58 -s ours
am:
9cb81aa210 -s ours
* commit '
9cb81aa210419ea14ff396fb533ad500094b00f2':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 03:03:13 +0000 (03:03 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours am:
7f0a1556ec -s ours
am:
dbe1804f58 -s ours
* commit '
dbe1804f580dcde68ac272b865808a8263219efb':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 02:55:44 +0000 (02:55 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours
am:
7f0a1556ec -s ours
* commit '
7f0a1556ecebe9cd861296897000e4b61f541158':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 02:47:59 +0000 (02:47 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev
am:
d083b37917 -s ours
* commit '
d083b379174b6cdfdd40204f4d4f4207fa2f332e':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 02:42:22 +0000 (02:42 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev
Joe LaPenna [Tue, 17 Nov 2015 02:42:10 +0000 (02:42 +0000)]
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
This reverts commit
88c7c3e08051f4a2be8ee5194214678a07ff7f01.
Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26
BUG:
23753686
Sanket Padawe [Tue, 17 Nov 2015 02:06:14 +0000 (02:06 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466 am:
ccfcb636ae am:
63e6aa8571 am:
32a190bd78 am:
7bb34d7517
am:
fc8f7cee01
* commit '
fc8f7cee0124bee1c75f05a18c112e37705836a9':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Tue, 17 Nov 2015 01:58:39 +0000 (01:58 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466 am:
ccfcb636ae am:
63e6aa8571 am:
32a190bd78
am:
7bb34d7517
* commit '
7bb34d7517cfef519a01e365c0da665852ac6b0b':
Don't allow contact sharing by default for device not recognized as carkit.
Dianne Hackborn [Fri, 30 Oct 2015 00:57:11 +0000 (17:57 -0700)]
Initial stab at background check.
Actually, this implementation is more what we want for ephemeral
apps. I am realizing the two are not really the same thing. :(
For this implementation, we now keep track of how long a uid has
been in the background, and after a certain amount of time
(currently 1 minute) we mark it as "idle". Any packages associated
with that uid are then no longer allowed to run in the background.
This means, until the app next goes in the foreground:
- No manifest broadcast receivers in the app will execute.
- No services can be started (binding services is still okay,
as this is outside dependencies on the app that should still
be represented).
- All alarms for the app are cancelled and no more can be set.
- All jobs for the app are cancelled and no more can be scheduled.
- All syncs for the app are cancelled and no more can be requested.
Change-Id: If53714ca4beed35faf2e89f916ce9eaaabd9290d
Sanket Padawe [Tue, 17 Nov 2015 01:43:07 +0000 (01:43 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466 am:
ccfcb636ae am:
63e6aa8571
am:
32a190bd78
* commit '
32a190bd787cbecfc4c87cda50ab6973b9e1c3cb':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 01:37:54 +0000 (01:37 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a am:
80bd5e6fd7
am:
9f275ec3fd
* commit '
9f275ec3fd422045f95c048905b112c0a93f4d34':
WindowDecorActionBar name change fix.
Sungsoo Lim [Tue, 17 Nov 2015 00:14:07 +0000 (09:14 +0900)]
Make TvContentRating.contains() public
Apply the feedback from API council.
Bug:
25726616
Change-Id: I9858a61eea50ff95221d453117fe3d991f88a33f
Sanket Padawe [Tue, 17 Nov 2015 01:33:24 +0000 (01:33 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466 am:
ccfcb636ae
am:
63e6aa8571
* commit '
63e6aa8571386dcf33ff0cf3949bdaf6c8e350db':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 01:28:58 +0000 (01:28 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a
am:
80bd5e6fd7
* commit '
80bd5e6fd77eb93c5e7f29cce279f8194be4478b':
WindowDecorActionBar name change fix.
Sanket Padawe [Tue, 17 Nov 2015 01:23:47 +0000 (01:23 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466
am:
ccfcb636ae
* commit '
ccfcb636ae0c99b974f3cbe3177322c41e33bb15':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 01:17:25 +0000 (01:17 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev
am:
62302bd72a
* commit '
62302bd72aaa6b0f934257447e8dcd636799180e':
WindowDecorActionBar name change fix.
Sanket Padawe [Tue, 17 Nov 2015 01:12:48 +0000 (01:12 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev
am:
abea6dc466
* commit '
abea6dc466cbd01be261192f8dbc083b58661bad':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 01:11:10 +0000 (01:11 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev
Sanket Padawe [Tue, 17 Nov 2015 01:07:28 +0000 (01:07 +0000)]
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev
Daichi Hirono [Tue, 17 Nov 2015 01:05:20 +0000 (01:05 +0000)]
Merge "Add a mehtod definition to StorageManager for appfuse."
Dianne Hackborn [Tue, 17 Nov 2015 00:41:35 +0000 (00:41 +0000)]
Merge "Don't send PACKAGE_CHANGED of components to manifest receivers."
Dianne Hackborn [Tue, 17 Nov 2015 00:41:07 +0000 (00:41 +0000)]
Merge "Some debugging improvements."
Dianne Hackborn [Thu, 12 Nov 2015 02:10:30 +0000 (18:10 -0800)]
Be smarter about determining when we can stop idle maintenance.
The device idle service now knows when the system is actively
doing significant things (syncs, jobs, alarms, downloads). It
uses this, when in an idle maintenance window, to determine when
it can end that window early -- when such work is no longer
happening.
For now this just allows us to shorten the windows. In the future
we should use this to allow us to expand the windows to a longer
potential time, adjusting future windows to shorter durations if
earlier ones use more time. This will allow us to batch occasional
long operations (such as downloads) into one window, making up
for that with much shorter later windows.
Change-Id: Ie482abd50bc43be9a8917a769a5175851eee4ec4
Michael Kwan [Tue, 17 Nov 2015 00:14:34 +0000 (00:14 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours am:
b0aae584ea -s ours
am:
2c8f3734af -s ours
* commit '
2c8f3734afd5f104166bfb045794970414eb5052':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Michael Kwan [Tue, 17 Nov 2015 00:06:28 +0000 (00:06 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours
am:
b0aae584ea -s ours
* commit '
b0aae584ea2a5649ac113ba05c88cbbe6616709e':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Adam Lesinski [Tue, 17 Nov 2015 00:00:48 +0000 (00:00 +0000)]
Merge "AAPT2: Prevent duplicate enums/flags"
Adam Lesinski [Mon, 16 Nov 2015 23:59:10 +0000 (15:59 -0800)]
AAPT2: Prevent duplicate enums/flags
Change-Id: I998cba12ac194000e9c778cb620ed7ab33003e7d
Michael Kwan [Mon, 16 Nov 2015 23:57:47 +0000 (23:57 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours
am:
f23229f45f -s ours
* commit '
f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Michael Kwan [Mon, 16 Nov 2015 23:48:39 +0000 (23:48 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
am:
8d6630b87c -s ours
* commit '
8d6630b87c93f569bbf5fc5b426fe2a1c2ff2ceb':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Deepanshu Gupta [Mon, 16 Nov 2015 23:46:12 +0000 (15:46 -0800)]
WindowDecorActionBar name change fix.
In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536,
WindowDecorActionBar's package name was changed. This breaks layoutlib.
Fix the issue by checking both package names when loading the class.
Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
Wale Ogunwale [Mon, 16 Nov 2015 23:45:13 +0000 (23:45 +0000)]
Merge "Crop window input region to stack bounds."
Adam Lesinski [Mon, 16 Nov 2015 23:44:49 +0000 (23:44 +0000)]
Merge "AAPT2: Fix tokenizer to deal with the separator as last char"
Adam Lesinski [Mon, 16 Nov 2015 23:37:30 +0000 (15:37 -0800)]
AAPT2: Fix tokenizer to deal with the separator as last char
When the separator was the last character, the tokenizer would skip
the empty string, which is wrong.
Change-Id: I64ceb4e8d4ac48ee41d40781ab5785a3bc61b24d
Daichi Hirono [Fri, 13 Nov 2015 05:37:00 +0000 (14:37 +0900)]
Add a mehtod definition to StorageManager for appfuse.
BUG=
25091416
Change-Id: Id4d4a000daf89fab4917528fcd0d1270547fbfa4
Adam Lesinski [Mon, 16 Nov 2015 23:41:25 +0000 (23:41 +0000)]
Merge "AAPT2: Fix a bug where files would only show up for one config"
Jeffrey Vander Stoep [Mon, 16 Nov 2015 23:33:53 +0000 (23:33 +0000)]
Merge "fix ApplicationInfo flag collision"
Daichi Hirono [Thu, 12 Nov 2015 03:12:48 +0000 (12:12 +0900)]
Prepare for adding MtpDocumentsProvider tests to APCT.
BUG=
25093356
Change-Id: I0c194e6bf3abeb632171e9be49471b9d94a0cb4c