OSDN Git Service
TreeHugger Robot [Tue, 10 Jan 2017 18:35:40 +0000 (18:35 +0000)]
Merge "Cleanup test method names."
Chris Craik [Tue, 10 Jan 2017 18:15:53 +0000 (18:15 +0000)]
Merge "Revert "Revert "Fast-path for ViewGroup#invalidateChild, invalidate tests"""
Mark Renouf [Tue, 10 Jan 2017 17:53:08 +0000 (17:53 +0000)]
Merge "Update javadoc for startActivityForResult(Intent, int, Bundle)"
Justin Klaassen [Tue, 10 Jan 2017 17:43:05 +0000 (17:43 +0000)]
Merge "Add AlarmClock#SHOW_TIMERS"
TreeHugger Robot [Tue, 10 Jan 2017 17:32:52 +0000 (17:32 +0000)]
Merge "Additional unit tests for isProvisioningAllowed"
Jeremy Joslin [Tue, 10 Jan 2017 16:53:02 +0000 (08:53 -0800)]
Cleanup test method names.
Renamed some test methods to reflect the proper permission.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
1764042
Change-Id: I5551ddcb411432c6aeb14c03d9a284aa68f1bd1b
Geoffrey Pitsch [Tue, 10 Jan 2017 16:20:10 +0000 (16:20 +0000)]
Merge "API improvements for creating NotificationChannels"
Sean Stout [Mon, 5 Dec 2016 22:05:03 +0000 (14:05 -0800)]
Add AlarmClock#SHOW_TIMERS
Test: run cts -m CtsContentTestCases
Bug:
31228110
Change-Id: Ia291a890b83996d6edf7b75afa52e44557a9117b
Nicolas Prevot [Tue, 10 Jan 2017 11:32:43 +0000 (11:32 +0000)]
Additional unit tests for isProvisioningAllowed
Test it with disallow add / remove managed profile user restrictions.
BUG:
32629873
Test: adb shell am instrument -e class
com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic6b01c2b0ed9081204801a6c5719b0fd25eafbba
Bryce Lee [Tue, 10 Jan 2017 15:24:20 +0000 (15:24 +0000)]
Merge "Amend logic for sending power hint on activity start."
Philipp Weiß [Tue, 10 Jan 2017 14:14:32 +0000 (14:14 +0000)]
Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev am:
a7c6324340
am:
418f072a0e
Change-Id: I0c765230dbcc82b05a488ad2f5e66cf20ef90551
phweiss [Tue, 10 Jan 2017 14:13:18 +0000 (14:13 +0000)]
Re-Add VPN-"Settings" button to QSFooter dialog am:
d361b181e5
am:
a524313118
Change-Id: Ifde3ad732f22e220f04d9e64de455070e42cb440
phweiss [Tue, 10 Jan 2017 14:12:06 +0000 (14:12 +0000)]
Dismiss network logging notification when disabling logging am:
971236480c
am:
0a5882980b
Change-Id: I37be8068c3c77b6ca45b1f4f831fcc7562630458
Philipp Weiß [Tue, 10 Jan 2017 14:03:04 +0000 (14:03 +0000)]
Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev
am:
a7c6324340
Change-Id: Ia0265e6401a9c3bee533383988755da02e6a251c
phweiss [Tue, 10 Jan 2017 14:02:57 +0000 (14:02 +0000)]
Re-Add VPN-"Settings" button to QSFooter dialog
am:
d361b181e5
Change-Id: Iee7dcfbb4a2bcaaddada850918185fc4d9cc47c1
phweiss [Tue, 10 Jan 2017 14:01:42 +0000 (14:01 +0000)]
Dismiss network logging notification when disabling logging
am:
971236480c
Change-Id: I7f47b6318ef8c4b792115c2721a0d56dc6cdbfd3
Philipp Weiß [Tue, 10 Jan 2017 13:54:25 +0000 (13:54 +0000)]
Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev
Andrew Scull [Tue, 10 Jan 2017 13:20:46 +0000 (13:20 +0000)]
Merge "Evict CE key on request and when work mode is turned off."
Ben Weiss [Tue, 10 Jan 2017 11:10:31 +0000 (11:10 +0000)]
Merge "Make ArcMotion material spec compliant"
phweiss [Mon, 9 Jan 2017 14:56:00 +0000 (15:56 +0100)]
Re-Add VPN-"Settings" button to QSFooter dialog
Button was removed during a redesign of the dialog in the case
of active device owner. However, when no DO is set, the button should
still be there.
Also, when VPN configuration is restricted, do not show the button, and
also do not show the link that is visible in the DO-version of the dialog.
Bug:
34156553
Bug:
29748723
Test: manual
Change-Id: I177afdc94dc396754fc7703e4316edaa7ce104cd
(cherry picked from commit
a99a3f70e2a07e7c85d25fed1881d1a6ef70a93c)
phweiss [Mon, 9 Jan 2017 16:43:14 +0000 (17:43 +0100)]
Dismiss network logging notification when disabling logging
Bug:
34116213
Bug:
29748723
Test: CTSVerifier in a separate CL.
Change-Id: Ie652505ff57665f626712c67837577833f1595d6
(cherry picked from commit
82ed31c1efeb98acba60d79d1fc0a291b1440dc2)
Philipp Weiß [Tue, 10 Jan 2017 10:15:23 +0000 (10:15 +0000)]
Merge "Dismiss network logging notification when disabling logging"
Philipp Weiß [Tue, 10 Jan 2017 10:14:34 +0000 (10:14 +0000)]
Merge "Re-Add VPN-"Settings" button to QSFooter dialog"
Bill Yi [Tue, 10 Jan 2017 07:31:47 +0000 (07:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3faf3467e3 -s ours
am:
aa92e65ff8 -s ours
Change-Id: I46d8d8d89b23c3b162708112e706ead5562e6d82
Bill Yi [Tue, 10 Jan 2017 07:30:39 +0000 (07:30 +0000)]
Import translations. DO NOT MERGE am:
5ef189ddeb -s ours
am:
ae3786a8b9 -s ours
Change-Id: I510a6275a8ca73be7d49aeb14ee27a295e8a635c
Bill Yi [Tue, 10 Jan 2017 07:29:29 +0000 (07:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
0ffe43ecd7 -s ours
am:
856bfc2019 -s ours
Change-Id: Id6431aeb418700ed20636fe6f369195d1501efb7
Bill Yi [Tue, 10 Jan 2017 07:28:30 +0000 (07:28 +0000)]
Import translations. DO NOT MERGE am:
4fcf5b1813 -s ours
am:
f685b49b28 -s ours
Change-Id: Ie333b72281a1f4aaf6d186a09f25e34d8a9c42f7
Bill Yi [Tue, 10 Jan 2017 07:21:29 +0000 (07:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
3faf3467e3 -s ours
Change-Id: Ibbdb7922b216c0c3ffeeccd1b2a02a8a8841ac47
Bill Yi [Tue, 10 Jan 2017 07:21:23 +0000 (07:21 +0000)]
Import translations. DO NOT MERGE
am:
5ef189ddeb -s ours
Change-Id: I34abef81d61a5b9f566bbb2877271ed7ea72a977
TreeHugger Robot [Tue, 10 Jan 2017 07:19:39 +0000 (07:19 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 10 Jan 2017 07:19:28 +0000 (07:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
0ffe43ecd7 -s ours
Change-Id: I06a438a8cf7de8effc3d62912c1bf8761ad08d59
Bill Yi [Tue, 10 Jan 2017 07:19:24 +0000 (07:19 +0000)]
Import translations. DO NOT MERGE
am:
4fcf5b1813 -s ours
Change-Id: Ie1da6f2d65250668afc630ccbfa61b7531c2721e
TreeHugger Robot [Tue, 10 Jan 2017 07:14:25 +0000 (07:14 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 10 Jan 2017 07:13:37 +0000 (07:13 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 10 Jan 2017 07:12:54 +0000 (07:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 10 Jan 2017 07:12:11 +0000 (07:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Jeff Sharkey [Tue, 10 Jan 2017 01:21:21 +0000 (18:21 -0700)]
Wire up storage stats API to installd.
Now that installd has the implementation details we need, we can wire
up the public APIs to use them.
Shuffle APIs around a bit so that StorageStats can be reused for both
UID and UserHandle results, and rename StorageSummary to
ExternalStorageStats. Provide getTotalBytes() and getFreeBytes() as
first-class methods so we can answer those questions quickly without
paying the cost of measuring external storage details.
Current costs on a typical device with a test account after flushing
dentry caches:
queryStatsForUid() manual: 6922ms
queryStatsForUid() quota: 525ms
queryStatsForUser() manual: 1686ms
queryStatsForUser() quota: 113ms
queryExternalStatsForUser() manual: 42ms
queryExternalStatsForUser() quota: 2ms
For verification purposes, a new "fw.verify_storage" system property
can be set to compute both manual and quota statistics, and log any
discrepancies.
Test: builds, boots
Bug:
27948817,
32206268
Change-Id: I4ea3df3372a7379aa8cf4c20c44120c8f0702c15
Jeff Sharkey [Tue, 10 Jan 2017 04:52:50 +0000 (04:52 +0000)]
Merge "Methods to calculate user and external disk usage." am:
6a9ad14172 am:
7beb2b75a9 am:
669affdb8e
am:
91b91b7f86
Change-Id: I7859db9f53560ad602bb26f37854bdfc02f15d09
Jeff Sharkey [Tue, 10 Jan 2017 04:47:47 +0000 (04:47 +0000)]
Merge "Methods to calculate user and external disk usage." am:
6a9ad14172 am:
7beb2b75a9
am:
669affdb8e
Change-Id: I698dd15a397f16dd2358729362860443f7e81a33
Jeff Sharkey [Tue, 10 Jan 2017 04:42:52 +0000 (04:42 +0000)]
Merge "Methods to calculate user and external disk usage." am:
6a9ad14172
am:
7beb2b75a9
Change-Id: I236eb3357b597cac26f5234a72551a471919a411
Jeff Sharkey [Tue, 10 Jan 2017 04:38:15 +0000 (04:38 +0000)]
Merge "Methods to calculate user and external disk usage."
am:
6a9ad14172
Change-Id: Ie4ab045a5425b35ce1bdd245f7c6ab248c796df2
Jeff Sharkey [Tue, 10 Jan 2017 04:30:46 +0000 (04:30 +0000)]
Merge "Methods to calculate user and external disk usage."
Bill Yi [Tue, 10 Jan 2017 04:17:25 +0000 (20:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I61019454236fb311bf7a428d077ddfd8a670da50
Auto-generated-cl: translation import
Bill Yi [Tue, 10 Jan 2017 04:05:48 +0000 (20:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idb74740bc5560b78a7b3d3cd7f2d92aee4ba411e
Auto-generated-cl: translation import
Yohei Yukawa [Tue, 10 Jan 2017 03:27:30 +0000 (03:27 +0000)]
Merge "Refresh IMMS#mBoundToMethod when IMS is disconnected"
Bill Yi [Tue, 10 Jan 2017 03:18:41 +0000 (19:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic7bd696893c0dd751de4c45097e404824174348c
Auto-generated-cl: translation import
Bill Yi [Tue, 10 Jan 2017 02:46:32 +0000 (18:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I014f52c4901ad6e3d020b5ad5f6f4a9471fdeea7
Auto-generated-cl: translation import
Android Build Merger (Role) [Tue, 10 Jan 2017 02:10:05 +0000 (02:10 +0000)]
Merge "Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age" am:
f66126c828 am:
620d4c24de am:
43818c45a4 am:
cfc07d4b2b"
John Reck [Tue, 10 Jan 2017 02:09:05 +0000 (02:09 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age" am:
f66126c828 am:
620d4c24de am:
43818c45a4
am:
cfc07d4b2b
Change-Id: I3a01387403c317671b64de7db0d976bcb9bda8af
Android Build Merger (Role) [Tue, 10 Jan 2017 02:08:36 +0000 (02:08 +0000)]
Merge "Merge "Cherrypick: Create ScoredNetwork Badging API changes." am:
e34e47d645 am:
3098d3839f am:
4962a3829f am:
4892f7d98f -s ours"
Sundeep Ghuman [Tue, 10 Jan 2017 02:07:42 +0000 (02:07 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes." am:
e34e47d645 am:
3098d3839f am:
4962a3829f
am:
4892f7d98f -s ours
Change-Id: I6aa58a64b1ce926363ca685041fed92cdd615bc3
Android Build Merger (Role) [Tue, 10 Jan 2017 02:07:18 +0000 (02:07 +0000)]
Merge "Merge "Expose fields in WifiConfiguration." am:
1ea4180c3a am:
ce13838ade am:
a0961255fc am:
12901df6e0 -s ours"
Amin Shaikh [Tue, 10 Jan 2017 02:06:10 +0000 (02:06 +0000)]
Merge "Expose fields in WifiConfiguration." am:
1ea4180c3a am:
ce13838ade am:
a0961255fc
am:
12901df6e0 -s ours
Change-Id: I371ac56a8e4c806db35d50ef5e1139d6ccf7d099
TreeHugger Robot [Tue, 10 Jan 2017 02:04:39 +0000 (02:04 +0000)]
Merge "Remove pinned stack when switching users."
TreeHugger Robot [Tue, 10 Jan 2017 02:03:04 +0000 (02:03 +0000)]
Merge "Add new metric for skipping disclaimer in support request"
Jack Yu [Tue, 10 Jan 2017 02:01:39 +0000 (02:01 +0000)]
Merge "Moved implicit intents into explicit intents" am:
ccda81e58f am:
b7db5ac6d8 -s ours am:
8679758cee -s ours
am:
2faeba5048 -s ours
Change-Id: Ia17ce9fea693033454efe54af09e23353c539034
Jack Yu [Tue, 10 Jan 2017 01:59:44 +0000 (01:59 +0000)]
Merge "Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a am:
9f60453361 -s ours am:
f22b197e08 -s ours" into nyc-mr2-dev-plus-aosp
am:
cb012c79e8 -s ours
Change-Id: I10250d3b81f499e78176c33c47fa8c01fa37ec4e
Jack Yu [Tue, 10 Jan 2017 01:59:32 +0000 (01:59 +0000)]
Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a am:
9f60453361 -s ours am:
f22b197e08 -s ours
am:
4ca7a379da -s ours
Change-Id: Idc63134e6ae1f64a8aa07cc25f97c450192acc1e
Michael Kwan [Tue, 10 Jan 2017 01:57:33 +0000 (01:57 +0000)]
Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01 am:
4ebbea26cc" into nyc-mr2-dev-plus-aosp
am:
636fc0d54c
Change-Id: Ia126f71f274f31b0d43086277199d7fcf55aa6f8
Michael Kwan [Tue, 10 Jan 2017 01:57:24 +0000 (01:57 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01 am:
4ebbea26cc
am:
69eac282e6
Change-Id: I657afb71f525f8d46d3c95f15c908cd070fda636
Michael Kwan [Tue, 10 Jan 2017 01:55:23 +0000 (01:55 +0000)]
Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01 am:
a95e7a2be7" into nyc-mr2-dev-plus-aosp
am:
a91bafc39c
Change-Id: I2b3989a255c90906db03280162c2c3cec1f77ee5
Michael Kwan [Tue, 10 Jan 2017 01:55:12 +0000 (01:55 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01 am:
a95e7a2be7
am:
88d9a67538
Change-Id: I7192cf19bf041d940274e11cd48e87d6f684b169
Michael Kwan [Tue, 10 Jan 2017 01:53:19 +0000 (01:53 +0000)]
Merge "Check if the activity translucency was converted before converted back. am:
39dd370d8e am:
fe9e68a63c" into nyc-mr2-dev-plus-aosp
am:
97efbc128f
Change-Id: Ib974a49f3b8a829153322fb1e04d185c0180da8e
Michael Kwan [Tue, 10 Jan 2017 01:53:11 +0000 (01:53 +0000)]
Check if the activity translucency was converted before converted back. am:
39dd370d8e am:
fe9e68a63c
am:
69f30b2d5e
Change-Id: I801cb49c0566f6762482d4f2855caf2199304980
John Reck [Tue, 10 Jan 2017 00:49:35 +0000 (00:49 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age" am:
f66126c828 am:
620d4c24de
am:
43818c45a4
Change-Id: Ia093688d4c9fc2e923daf5da6d5b6d67c6b56975
Winson Chung [Mon, 9 Jan 2017 23:44:55 +0000 (15:44 -0800)]
Remove pinned stack when switching users.
- Make behavior consistent for both docked and pinned stacks when
switching users.
Test: Enter PIP, switch users
Change-Id: Ia4a86560dbf9f977fd72f5f9b443b508cea4a2d1
John Reck [Tue, 10 Jan 2017 00:44:29 +0000 (00:44 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age" am:
f66126c828
am:
620d4c24de
Change-Id: I4fdb8ecba5a08f712871d3b99e0286c61f6d0806
John Reck [Tue, 10 Jan 2017 00:39:28 +0000 (00:39 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age"
am:
f66126c828
Change-Id: I649478ca7aa33de82a1524dfe9925c0a2d82a7a7
Treehugger Robot [Tue, 10 Jan 2017 00:26:42 +0000 (00:26 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age"
Bryce Lee [Tue, 10 Jan 2017 00:18:14 +0000 (16:18 -0800)]
Amend logic for sending power hint on activity start.
We previously used task boundaries to determine when to send the hint.
This does not properly capture the target use case. Additionally, the
implementation does not identify this condition properly.
The new check is based on comparing the process of the existing resumed
activity in the stack. We will send the hint if the process is changing
or there is no resumed activity.
Bug:
32640289
Test: Manual - ran systrace capture script and verified regression
resolved (observed consistently over multiple attempts).
Change-Id: Ie3cdd17773f3466d9b3c7abb6ec5b4093ddc3631
Michael Kwan [Tue, 10 Jan 2017 00:12:53 +0000 (16:12 -0800)]
resolve merge conflicts of
c252b661e607 to master
Change-Id: Ia3fbedc5b0f90988ef319720a9e668ccc9e297f4
Sundeep Ghuman [Tue, 10 Jan 2017 00:05:21 +0000 (00:05 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes." am:
e34e47d645 am:
3098d3839f
am:
4962a3829f
Change-Id: Ia3928c4113e8f07969a3d551e31d6307f61e848e
Amin Shaikh [Tue, 10 Jan 2017 00:04:00 +0000 (00:04 +0000)]
Merge "Expose fields in WifiConfiguration." am:
1ea4180c3a am:
ce13838ade
am:
a0961255fc
Change-Id: I1232829112d6f5ba5fa99199555e584c91ae35af
Jeff Sharkey [Mon, 9 Jan 2017 00:06:58 +0000 (17:06 -0700)]
Methods to calculate user and external disk usage.
Add method to calculate user disk usage, which will be faster than
making a Binder call for every single appId under a user. Add method
to calculate external disk usage, which uses file extensions to track
usage with "audio", "video", and "images" categories.
Start measuring internal and external storage space separately; new
GIDs are coming in a future CL. Pass down all package names, inodes,
and code paths, since shared UIDs host more than one.
Test: builds, boots, stats are consistent
Bug:
27948817,
32206268
Change-Id: Icbb82a30fe711ef05e9a16bb1dc740dc943a9ddc
Sundeep Ghuman [Mon, 9 Jan 2017 23:55:47 +0000 (23:55 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes." am:
e34e47d645
am:
3098d3839f
Change-Id: I5f7d741dbd7f91518495f02de995bca6d191aa4e
Amin Shaikh [Mon, 9 Jan 2017 23:54:30 +0000 (23:54 +0000)]
Merge "Expose fields in WifiConfiguration." am:
1ea4180c3a
am:
ce13838ade
Change-Id: Ia391a1b115646ad0409c5b52fee664d42901dd18
Sundeep Ghuman [Mon, 9 Jan 2017 23:51:07 +0000 (23:51 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes."
am:
e34e47d645
Change-Id: Ibeb6c60c30c302e12c45c7f35a7e4af904a4a6d5
Amin Shaikh [Mon, 9 Jan 2017 23:45:15 +0000 (23:45 +0000)]
Merge "Expose fields in WifiConfiguration."
am:
1ea4180c3a
Change-Id: I6a145981692cbaf791b735d55a1a9b7aa24aee62
Treehugger Robot [Mon, 9 Jan 2017 23:39:47 +0000 (23:39 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes."
Treehugger Robot [Mon, 9 Jan 2017 23:33:24 +0000 (23:33 +0000)]
Merge "Expose fields in WifiConfiguration."
Jack Yu [Mon, 9 Jan 2017 23:24:54 +0000 (23:24 +0000)]
Merge "Moved implicit intents into explicit intents" am:
ccda81e58f am:
b7db5ac6d8 -s ours
am:
8679758cee -s ours
Change-Id: Ic388f1ca1b3c2e65b88f60eefa87a7c6f63fcf86
Jack Yu [Mon, 9 Jan 2017 23:19:55 +0000 (23:19 +0000)]
Merge "Moved implicit intents into explicit intents" am:
ccda81e58f
am:
b7db5ac6d8 -s ours
Change-Id: I13a65c3d132c465b43baa64d195ce9f03f96e167
Android Build Merger (Role) [Mon, 9 Jan 2017 23:18:20 +0000 (23:18 +0000)]
Merge "Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a am:
9f60453361 -s ours am:
f22b197e08 -s ours" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Mon, 9 Jan 2017 23:17:37 +0000 (23:17 +0000)]
Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01 am:
4ebbea26cc" into nyc-mr2-dev-plus-aosp
Jack Yu [Mon, 9 Jan 2017 23:17:36 +0000 (23:17 +0000)]
Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a am:
9f60453361 -s ours
am:
f22b197e08 -s ours
Change-Id: If6819bb182a58a24a15bbbcfc08a4ecf3684e5e4
Android Build Merger (Role) [Mon, 9 Jan 2017 23:17:14 +0000 (23:17 +0000)]
Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01 am:
a95e7a2be7" into nyc-mr2-dev-plus-aosp
Michael Kwan [Mon, 9 Jan 2017 23:16:41 +0000 (23:16 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01
am:
4ebbea26cc
Change-Id: I48f67ac1a8f54529bd4a37770fc1c35dc7cabb6d
Michael Kwan [Mon, 9 Jan 2017 23:16:27 +0000 (23:16 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01
am:
a95e7a2be7
Change-Id: I290cf138b577deb8d2f70ca22a4107be4abb186a
Android Build Merger (Role) [Mon, 9 Jan 2017 23:16:11 +0000 (23:16 +0000)]
Merge "Check if the activity translucency was converted before converted back. am:
39dd370d8e am:
fe9e68a63c" into nyc-mr2-dev-plus-aosp
Michael Kwan [Mon, 9 Jan 2017 23:15:28 +0000 (23:15 +0000)]
Check if the activity translucency was converted before converted back. am:
39dd370d8e
am:
fe9e68a63c
Change-Id: I7df6d29f1b26afaed2da8da4e645447ebd38a7f9
Michael Kwan [Mon, 9 Jan 2017 23:15:23 +0000 (23:15 +0000)]
Check if the activity translucency was converted before converted back. am:
39dd370d8e
am:
898385ed59
Change-Id: I5bee496498ebcff712184f417adfdf8ee5436e7d
Jack Yu [Mon, 9 Jan 2017 23:11:23 +0000 (23:11 +0000)]
Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a
am:
9f60453361 -s ours
Change-Id: I20385bd6216925de59d6ea2ac107b04e374b03b7
Jack Yu [Mon, 9 Jan 2017 23:10:55 +0000 (23:10 +0000)]
Merge "Moved implicit intents into explicit intents"
am:
ccda81e58f
Change-Id: I90ccdbceba9492f95c658a7fabd113a35dcc8ae2
Michael Kwan [Mon, 9 Jan 2017 23:06:25 +0000 (23:06 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev
am:
6d7dc11e01
Change-Id: I1ad11517c50cda3b37d3193ace983bb8b1a58c36
Michael Kwan [Mon, 9 Jan 2017 23:06:24 +0000 (23:06 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev
am:
6d7dc11e01
Change-Id: I1331dadb63009eb7acf693b59f16aebe1557d51e
Michael Kwan [Mon, 9 Jan 2017 23:06:22 +0000 (23:06 +0000)]
Check if the activity translucency was converted before converted back.
am:
39dd370d8e
Change-Id: Ibf6e7b3a1d2767c91cca402fabcc1a0a3616733e
Michael Kwan [Mon, 9 Jan 2017 23:06:21 +0000 (23:06 +0000)]
Check if the activity translucency was converted before converted back.
am:
39dd370d8e
Change-Id: Ib0705da70acd8abceedd5c1deeacae5023032543
TreeHugger Robot [Mon, 9 Jan 2017 22:59:50 +0000 (22:59 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev
Eugene Susla [Mon, 9 Jan 2017 22:59:36 +0000 (22:59 +0000)]
Merge "Unit test to keep a11y cache critical events up to date"
Joe Onorato [Mon, 9 Jan 2017 22:57:27 +0000 (22:57 +0000)]
Hold a wake lock while DeviceIdleController is going idle. am:
b08db484c2 am:
e678f29684
am:
854bff71c4
Change-Id: If29ff885cce767a54b2cc7435e76eecc8f9ec128
OSDN Git Service
