OSDN Git Service
Eugene Susla [Thu, 15 Jun 2017 22:15:25 +0000 (22:15 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev am:
7a4cf16ce9 am:
7e5fd51c9b
am:
900edc19d4
Change-Id: I944c5d24f51c26aac54a0c5774531bbbc2d23ca5
Eugene Susla [Thu, 15 Jun 2017 22:09:22 +0000 (22:09 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev am:
7a4cf16ce9 am:
812d6d9b80
am:
5fcaf8e9c4
Change-Id: I49be989c2946e10e8b8de7097bffd999045dbf62
Eugene Susla [Thu, 15 Jun 2017 22:00:21 +0000 (22:00 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev am:
7a4cf16ce9
am:
7e5fd51c9b
Change-Id: I909e4238fe74940a6a1e3a4e9a1a8f7f3dc45dd6
Eugene Susla [Thu, 15 Jun 2017 21:55:52 +0000 (21:55 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev am:
7a4cf16ce9
am:
812d6d9b80
Change-Id: I7f736af6fefcd9f4f337c4a5a899719deb6a1290
Eino-Ville Talvala [Thu, 15 Jun 2017 21:48:47 +0000 (21:48 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev am:
20c2116c1f am:
730a1168e6
am:
12344cf48d
Change-Id: If9b71eacb1b3ccbaadda4e6fece6b604d60e114e
Eugene Susla [Thu, 15 Jun 2017 21:48:47 +0000 (21:48 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev
am:
7a4cf16ce9
Change-Id: Iad09afd86c9e6b3692654083743d5014b978cac8
Eugene Susla [Thu, 15 Jun 2017 21:44:37 +0000 (21:44 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev
am:
7a4cf16ce9
Change-Id: I09daacb8e9d0e4926f83707cce20a9a13e31e4e1
Android Build Merger (Role) [Thu, 15 Jun 2017 21:42:35 +0000 (21:42 +0000)]
Merge "Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev am:
20c2116c1f am:
20e2394f75 am:
50ba0b7196"
Eino-Ville Talvala [Thu, 15 Jun 2017 21:41:34 +0000 (21:41 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev am:
20c2116c1f am:
20e2394f75
am:
50ba0b7196
Change-Id: I8153eb8e7859738fa1dfa94b81fc7c7d8f94ed33
Adam Lesinski [Thu, 15 Jun 2017 21:40:37 +0000 (21:40 +0000)]
Merge "AAPT2: Fix issue with enums and integer attributes"
Eino-Ville Talvala [Thu, 15 Jun 2017 21:39:00 +0000 (21:39 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev am:
20c2116c1f
am:
730a1168e6
Change-Id: Ibdb549782294671faf606a5ee44e0b03e4d8a8d4
Eino-Ville Talvala [Thu, 15 Jun 2017 21:29:16 +0000 (21:29 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev am:
20c2116c1f
am:
20e2394f75
Change-Id: If7a88771020bd2cb8a5a38496488dfbd789debf7
Eino-Ville Talvala [Thu, 15 Jun 2017 21:12:29 +0000 (21:12 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
am:
20c2116c1f
Change-Id: I8385f1e65de888d602e5775f6811ec7c908f9073
Eino-Ville Talvala [Thu, 15 Jun 2017 21:10:51 +0000 (21:10 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
am:
20c2116c1f
Change-Id: I82b234f1fa7ea6b231bacdd99543b68fa8be51c6
TreeHugger Robot [Thu, 15 Jun 2017 20:57:16 +0000 (20:57 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev
TreeHugger Robot [Thu, 15 Jun 2017 20:56:38 +0000 (20:56 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
Ying Xu [Thu, 15 Jun 2017 20:11:54 +0000 (20:11 +0000)]
Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2" into stage-aosp-master am:
fa67fe7a4e am:
d7e9bbedc8
am:
d775de3ff0
Change-Id: I7c2405956abbf02da998f7b788dfb81a3a1fbaa5
Ying Xu [Thu, 15 Jun 2017 20:09:07 +0000 (20:09 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2 am:
c4f797652c am:
ce80092aaf
am:
7682ce6076
Change-Id: I4a11cb67000324f9755c3cb6ab1d15dd6e23238b
Jason Monk [Thu, 15 Jun 2017 20:06:14 +0000 (20:06 +0000)]
Merge "resolve merge conflicts of
8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp am:
797fdc4450
am:
57f58037b4
Change-Id: I51089e75c8a508cbbd39d8949b3e660fa6a16b14
Sudheer Shanka [Thu, 15 Jun 2017 20:00:50 +0000 (20:00 +0000)]
Merge "Merge "Use correct timestamps of events for logging." into oc-dev am:
2ca51820f0 am:
5618d79349" into oc-dr1-dev-plus-aosp
am:
a76b4e358a
Change-Id: I37300ca97954b64b47f997cd824ab5f48e55c66a
Ying Xu [Thu, 15 Jun 2017 19:58:40 +0000 (19:58 +0000)]
Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2" into stage-aosp-master am:
fa67fe7a4e
am:
d7e9bbedc8
Change-Id: I9a3d4e90de84c9745369f20905215bb6d761cebb
Ying Xu [Thu, 15 Jun 2017 19:56:18 +0000 (19:56 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2 am:
c4f797652c
am:
ce80092aaf
Change-Id: Iec9e028d5c05d427cc3b1f81e97defb873b13d64
Sudheer Shanka [Thu, 15 Jun 2017 19:52:44 +0000 (19:52 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev am:
2ca51820f0 am:
f9053435a3
am:
1cb45b6345
Change-Id: Ib627fa2d105a9df73edb86a0c631dfca1e4c1f9b
Jason Monk [Thu, 15 Jun 2017 19:49:52 +0000 (19:49 +0000)]
Merge "resolve merge conflicts of
8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
797fdc4450
Change-Id: I71bf3a951130edc7af2c7e0f24b2acb078d76a83
Ying Xu [Thu, 15 Jun 2017 19:48:07 +0000 (19:48 +0000)]
Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2" into stage-aosp-master
am:
fa67fe7a4e
Change-Id: I62d094ce16e65bf613e5e4b9405c87726e175c8f
Android Build Merger (Role) [Thu, 15 Jun 2017 19:46:21 +0000 (19:46 +0000)]
Merge "Merge "Use correct timestamps of events for logging." into oc-dev am:
2ca51820f0 am:
5618d79349" into oc-dr1-dev-plus-aosp
Sudheer Shanka [Thu, 15 Jun 2017 19:45:19 +0000 (19:45 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev am:
2ca51820f0
am:
5618d79349
Change-Id: I5d79993e0e855501aa13b1afcd7af068eeeb3d93
Ying Xu [Thu, 15 Jun 2017 19:44:45 +0000 (19:44 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2
am:
c4f797652c
Change-Id: If7d2093b6ff24bffeeb75a6eb0e91d047b872dad
Sudheer Shanka [Thu, 15 Jun 2017 19:43:37 +0000 (19:43 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev am:
2ca51820f0
am:
f9053435a3
Change-Id: I8ad8b8a273b70345ac024e27faa1484fb06afacd
TreeHugger Robot [Thu, 15 Jun 2017 19:42:47 +0000 (19:42 +0000)]
Merge "resolve merge conflicts of
8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp
Sudheer Shanka [Thu, 15 Jun 2017 19:36:18 +0000 (19:36 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev
am:
2ca51820f0
Change-Id: I077aab98854ec3d7df78b107518e0151be78a30c
Sudheer Shanka [Thu, 15 Jun 2017 19:34:11 +0000 (19:34 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev
am:
2ca51820f0
Change-Id: I863f048dd4b95c0f9278fe8aefc432f852b82eae
Sudheer Shanka [Thu, 15 Jun 2017 19:25:02 +0000 (19:25 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev
Dianne Hackborn [Thu, 15 Jun 2017 19:10:40 +0000 (19:10 +0000)]
Merge "Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
ef0554438f am:
92cc8d3816" into oc-dr1-dev-plus-aosp
am:
50cc533414
Change-Id: I883917c1e4d5d0fc76ac0e3698317ccae46ff3d8
Dianne Hackborn [Thu, 15 Jun 2017 19:08:07 +0000 (19:08 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
ef0554438f am:
84795f778b
am:
56617fd24f
Change-Id: I0051a01a498d77e0dea10ce31c51912b7747b551
Android Build Merger (Role) [Thu, 15 Jun 2017 19:04:11 +0000 (19:04 +0000)]
Merge "Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
ef0554438f am:
92cc8d3816" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Thu, 15 Jun 2017 19:01:41 +0000 (19:01 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
ef0554438f
am:
84795f778b
Change-Id: I90d6e150b6dcfe7665b5c1b7db84dd04a7d0d824
Dianne Hackborn [Thu, 15 Jun 2017 19:01:37 +0000 (19:01 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
ef0554438f
am:
92cc8d3816
Change-Id: I1b83fc377f95dad7e5692f82601dddafdd9ab92c
Dianne Hackborn [Thu, 15 Jun 2017 18:52:18 +0000 (18:52 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
am:
ef0554438f
Change-Id: I5d25640507d4c4cf61f64638d27ddf0cac67f880
Dianne Hackborn [Thu, 15 Jun 2017 18:52:07 +0000 (18:52 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
am:
ef0554438f
Change-Id: I39ad3ffce83c1817bdc8aa7ab9f623d1b683d983
Dianne Hackborn [Thu, 15 Jun 2017 18:45:28 +0000 (18:45 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
Eugene Susla [Thu, 15 Jun 2017 18:22:57 +0000 (11:22 -0700)]
Fix companion uses-permission enforcement
Fixes: b/
62662686
Test: Call CompanionDeviceManager#associate from app without uses-permission
declaration
Ensure exception is thrown
Call the method from app with the declaration
Ensure no exception is thrown
In debug mode catch the #isCallerSystem call from NotificationManagerService
(which runs in the system process) and ensure it passes the check
Change-Id: I26e5d2a7f5e63a346d4ab50b9ded1ec7dbc246a5
Stephen Chen [Thu, 15 Jun 2017 18:18:06 +0000 (18:18 +0000)]
Merge "Add notification ID for Wi-Fi ONA notifications." into oc-dr1-dev am:
ae448fbf5f
am:
56d7fd1e2b
Change-Id: I45ed7e5813a1aa01898e0a46cfa3d6decafea928
Adam Lesinski [Tue, 13 Jun 2017 23:03:55 +0000 (16:03 -0700)]
AAPT2: Fix issue with enums and integer attributes
When an attribute had the format "enum|integer", and a max or min
allowed value set, any value set for this attribute would have its
enum symbol's value checked against the valid integer range.
This would lead to the following:
android:numColumns="autofit"
being interpreted as an integer value of -1, which violated the minimum
expected value for numColumns, which was 0.
Bug:
62358540
Test: make aapt2_tests
Change-Id: I3150410448a533d3595a08ac6b2966264db874d8
Stephen Chen [Thu, 15 Jun 2017 18:11:36 +0000 (18:11 +0000)]
Merge "Add notification ID for Wi-Fi ONA notifications." into oc-dr1-dev
am:
ae448fbf5f
Change-Id: I7fbc759fc689819790055e6ff7b4794dc4388e19
TreeHugger Robot [Thu, 15 Jun 2017 18:08:52 +0000 (18:08 +0000)]
Merge "Add a new setting category for the account detail page."
TreeHugger Robot [Thu, 15 Jun 2017 18:03:53 +0000 (18:03 +0000)]
Merge "Add notification ID for Wi-Fi ONA notifications." into oc-dr1-dev
Jason Monk [Thu, 15 Jun 2017 17:41:14 +0000 (13:41 -0400)]
resolve merge conflicts of
8c1e6e49f95b to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If41b96601018976c8f5a5ea8d124bc0abb4ef605
Roozbeh Pournader [Thu, 15 Jun 2017 17:21:48 +0000 (17:21 +0000)]
Merge "Make Linkify use the SIM card's country for phone numbers"
Marc Hittinger [Thu, 15 Jun 2017 17:15:34 +0000 (17:15 +0000)]
Merge "Remove redundant hwaccelerated enabling."
Android Build Merger (Role) [Thu, 15 Jun 2017 17:07:11 +0000 (17:07 +0000)]
Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2" into stage-aosp-master
Ying Xu [Thu, 15 Jun 2017 17:06:03 +0000 (17:06 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode."
am:
3890689bb2
Change-Id: I6b295dfe38e8c75ab6dd3add2521d63b62f4c8f1
Ying Xu [Thu, 15 Jun 2017 16:59:59 +0000 (16:59 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode."
am:
3890689bb2
Change-Id: I07e33a09f7ed2af457d2ad6261b5469b9dfd15c2
Ying Xu [Thu, 15 Jun 2017 16:50:09 +0000 (16:50 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode."
Chris Wren [Thu, 15 Jun 2017 16:46:53 +0000 (16:46 +0000)]
Merge "Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe am:
4bf303695b" into oc-dr1-dev-plus-aosp
am:
9de4174689
Change-Id: I8e9ab9456a0b1f6381dee4ce7fe40a313f23860d
Chris Wren [Thu, 15 Jun 2017 16:43:57 +0000 (16:43 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe am:
c31da7a282
am:
0e21a57709
Change-Id: I4f3bba6ede13af9140de86724e663eb0372a3ed8
Android Build Merger (Role) [Thu, 15 Jun 2017 16:40:10 +0000 (16:40 +0000)]
Merge "Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe am:
4bf303695b" into oc-dr1-dev-plus-aosp
Chris Wren [Thu, 15 Jun 2017 16:37:26 +0000 (16:37 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe
am:
c31da7a282
Change-Id: I0dba70d94710852d07fa3f141d61ed869756a379
Chris Wren [Thu, 15 Jun 2017 16:37:26 +0000 (16:37 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe
am:
4bf303695b
Change-Id: I8549aa837ade3636532deeacb197037e6da131a8
Evan Laird [Thu, 15 Jun 2017 16:31:56 +0000 (16:31 +0000)]
Merge "Status bar opacity and mobile signal changes" into oc-dr1-dev am:
e836b7d8e5
am:
2cac3959c0
Change-Id: Id9a199bf0ccd6c9ac831dfebfd0f9d67649aa01d
Chris Wren [Thu, 15 Jun 2017 16:28:32 +0000 (16:28 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
am:
04298759fe
Change-Id: I4813fcd717b966e2ed2b1835d12d4183633f60ff
Chris Wren [Thu, 15 Jun 2017 16:28:27 +0000 (16:28 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
am:
04298759fe
Change-Id: Ic53f15be9f13034e72fa056308e75fa0f4f310b0
Evan Laird [Thu, 15 Jun 2017 16:22:01 +0000 (16:22 +0000)]
Merge "Status bar opacity and mobile signal changes" into oc-dr1-dev
am:
e836b7d8e5
Change-Id: I39dd789b5daea9abfafac22860e68d43d2a07746
TreeHugger Robot [Thu, 15 Jun 2017 16:20:07 +0000 (16:20 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
TreeHugger Robot [Thu, 15 Jun 2017 16:14:46 +0000 (16:14 +0000)]
Merge "Status bar opacity and mobile signal changes" into oc-dr1-dev
Jason Monk [Thu, 15 Jun 2017 15:32:26 +0000 (15:32 +0000)]
Merge "NfcTile: make sure NFC adapter is always available when needed"
am:
13ade8f910
Change-Id: I731c4d0f3460d1b2a24232a87afcd5c327ecb4b0
Jason Monk [Thu, 15 Jun 2017 15:21:36 +0000 (15:21 +0000)]
Merge "NfcTile: make sure NFC adapter is always available when needed"
Anas Karbila [Thu, 15 Jun 2017 13:36:53 +0000 (22:36 +0900)]
NfcTile: make sure NFC adapter is always available when needed
Test: enable NFC->reboot->directly open QS panel, NFC tile will show disabled state. This commit fixes it.
Change-Id: Iabbe4ec11a38614b9c65627d58c6ee9ec93435f3
Eino-Ville Talvala [Tue, 13 Jun 2017 19:43:19 +0000 (12:43 -0700)]
ImageReader: Set BufferItem mGraphicBuffer to null when returning it
The ImageReader JNI layer needs to maintain a list of BufferItems that
back the Java Image objects. At start, we allocate maxImages of these
in a list, and acquire and release them from this list as the
application acquires and releases Images.
However, on release, the contents of the BufferItem are not adjusted,
so it can retain a reference to a GraphicBuffer until the BufferItem
is reused.
Test: Camera CTS passes, memory usage drops after camera bursts
Bug:
62652080
Change-Id: I9aade5e32cbe0af0c15a3886e16ada1a70392b74
Chris Wren [Wed, 14 Jun 2017 19:59:03 +0000 (15:59 -0400)]
add a log for peek to shade expansion
Move the note_load counter into the manager, replacing
the redundant and useless notification_load counter.
Update the StatusBarTest to allow for hander side-effects.
Test: runtest systemui
Change-Id: I2551c51cc0f4627995abe4401eafc2e5adb3a8fa
Fixes:
27698560
Derek Sollenberger [Thu, 15 Jun 2017 12:54:17 +0000 (12:54 +0000)]
Merge "Revert buffer age workaround for Adreno GPUs."
Paul Duffin [Thu, 15 Jun 2017 11:13:08 +0000 (11:13 +0000)]
Fix dependencies of packages that target earlier releases am:
37e9a28262
am:
68117e559a
Change-Id: I9c0617b6d29afd7a00ae6ead042225489b934255
Paul Duffin [Thu, 15 Jun 2017 11:04:30 +0000 (11:04 +0000)]
Fix dependencies of packages that target earlier releases
am:
37e9a28262
Change-Id: Ib8b9272423ba7513ea653843335fd1907970c40f
Erik Kline [Thu, 15 Jun 2017 10:58:12 +0000 (10:58 +0000)]
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev am:
ed1519d095 -s ours
am:
8411065453 -s ours
Change-Id: I3e695c75e3e06f0bd70568b462f0ba9cf307384c
Erik Kline [Thu, 15 Jun 2017 10:49:12 +0000 (10:49 +0000)]
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev
am:
ed1519d095 -s ours
Change-Id: I61101f481d6508786664d49a7f7a560a29464a8e
TreeHugger Robot [Thu, 15 Jun 2017 10:43:18 +0000 (10:43 +0000)]
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev
Paul Duffin [Tue, 13 Jun 2017 14:53:11 +0000 (15:53 +0100)]
Fix dependencies of packages that target earlier releases
A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.
This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* packages/SettingsProvider/test/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SettingsProviderTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
SettingsProviderTest uses classes from package android.test
(possible indirectly) and needs them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
* services/tests/servicestests/Android.mk
Replaced 'android.test.runner' with 'android.test.mock' and
'legacy-android-test' in LOCAL_JAVA_LIBRARIES because module
FrameworksServicesTests uses classes from packages android.test and
android.test.mock (possible indirectly) and needs them available at
compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
They were not added to LOCAL_STATIC_JAVA_LIBRARIES because
FrameworksServicesTests's manifest file (AndroidManifest.xml)
targets API level 26 and uses the android.test.runner library which
will provide the classes dynamically at runtime.
Dependency 'android.test.mock.sdk' is used instead of
'android.test.mock' because module FrameworksServicesTests builds
against internal jars not the API and so should use libraries that
build against internal jars not the API.
* tests/AppLaunch/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppLaunch uses classes from
package android.test (possible indirectly) and needs them available
at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppLaunch's manifest file (AndroidManifest.xml) targets API
level 24 and dynamically includes the android.test.runner library
at runtime so there is no point in statically including the
classes.
* tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module SmartCamera-tests uses classes
from package android.test (possible indirectly) and needs them
available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SmartCamera-tests's manifest file (AndroidManifest.xml)
targets API level 17 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
* tests/Compatibility/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppCompatibilityTest uses
classes from package android.test (possible indirectly) and needs
them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppCompatibilityTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Bug:
30188076
Test: make checkbuild and ran a sample of tests
Change-Id: I3d183a96bf87437028a2d4b774d311e40349f4d0
Jorim Jaggi [Thu, 15 Jun 2017 06:48:31 +0000 (06:48 +0000)]
Merge "Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c am:
641160b7d4" into oc-dr1-dev-plus-aosp
am:
2e26c880b2
Change-Id: I6bc39ca7e61285da880eb5b3916b4828f6745d41
Jorim Jaggi [Thu, 15 Jun 2017 06:45:49 +0000 (06:45 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c am:
a3fe8ac375
am:
385e6c69fb
Change-Id: Ia1b3d52bdcf7a8d9c436ccb643f33dd33a6bab9a
Android Build Merger (Role) [Thu, 15 Jun 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c am:
641160b7d4" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Thu, 15 Jun 2017 06:37:48 +0000 (06:37 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c
am:
a3fe8ac375
Change-Id: I5c1ee370d7e1601504c9760b64fda068fbedb02a
Jorim Jaggi [Thu, 15 Jun 2017 06:37:47 +0000 (06:37 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c
am:
641160b7d4
Change-Id: I035880f9702a2f3978e951cda519c40d4fabd19a
Jorim Jaggi [Thu, 15 Jun 2017 06:37:39 +0000 (06:37 +0000)]
Merge "Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436 am:
e5e4365ba6" into oc-dr1-dev-plus-aosp
am:
1676f81a7a
Change-Id: Ia7cf1b862975da505e3a9898ba8b216d5f91c052
Jorim Jaggi [Thu, 15 Jun 2017 06:35:13 +0000 (06:35 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436 am:
06f3e97e3f
am:
b8fe4339cc
Change-Id: I368f1c4158e1a7b209fea067a27930f0723d1c95
Jorim Jaggi [Thu, 15 Jun 2017 06:30:57 +0000 (06:30 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
am:
0823c9ff5c
Change-Id: Iee0f34f4a285b02d3747f630058ef6fad50d4c79
Jorim Jaggi [Thu, 15 Jun 2017 06:30:15 +0000 (06:30 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
am:
0823c9ff5c
Change-Id: Idb18d226c2d7d427fcbb61ff2218d5fd034cb63e
Android Build Merger (Role) [Thu, 15 Jun 2017 06:29:46 +0000 (06:29 +0000)]
Merge "Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436 am:
e5e4365ba6" into oc-dr1-dev-plus-aosp
Erik Kline [Mon, 5 Jun 2017 07:02:02 +0000 (16:02 +0900)]
Move findPreferredUpstreamType into UNM
This changes the way in which available networks are found. Previously
Tethering asked ConnectivityService for NetworkInfo and checked for
whether or not it was in state CONNECTED.
Here we use the fact that ConnectivityService will not call UNM's
callbacks' onAvailable() methods until the networks in question have
become connected.
Test: as follows
- built
- flashed
- booted
- runtest framework-net passed
Bug:
29337859
Bug:
32163131
Merged-In: I9937297727aa1a063e499fccd5833ace229b1e8a
Merged-In: Ifa1a34a1fb32149085421a63cb0f2586d2862d6b
Merged-In: Ia215e55b69b856f5511e5d4f852e39fa6c11462e
Change-Id: I97abe225fdd3accb38bd9168f545445b761a90d8
(cherry picked from commit
a1d368af2f01e2048240fb730f6cc399fc1cc1ab)
Jorim Jaggi [Thu, 15 Jun 2017 06:27:19 +0000 (06:27 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436
am:
e5e4365ba6
Change-Id: I91ed3bbc04340a8effda1381a95f239231101b5f
Jorim Jaggi [Thu, 15 Jun 2017 06:27:18 +0000 (06:27 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436
am:
06f3e97e3f
Change-Id: I3195d7c680c06513d7c2d6c4a7b6290123841126
Juho Ha [Thu, 15 Jun 2017 06:25:14 +0000 (06:25 +0000)]
Merge "Disabled task snapshot for IoT devices"
TreeHugger Robot [Thu, 15 Jun 2017 06:24:30 +0000 (06:24 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
Jorim Jaggi [Thu, 15 Jun 2017 06:18:48 +0000 (06:18 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev
am:
7831f0c436
Change-Id: I04be9b9286240009dd4e8c6cfd207b04eadf9b5d
Jorim Jaggi [Thu, 15 Jun 2017 06:18:48 +0000 (06:18 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev
am:
7831f0c436
Change-Id: Ie09778df49eaa937b96a38f9c07d27bf87dbfdcf
Jorim Jaggi [Thu, 15 Jun 2017 06:11:10 +0000 (06:11 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev
Sundeep Ghuman [Thu, 15 Jun 2017 05:41:51 +0000 (05:41 +0000)]
Merge "Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1 am:
7dd2635319" into oc-dr1-dev-plus-aosp
am:
3e8e8c3395
Change-Id: Idf481723aff1a8b7b6f01e5059c88f2cb0b0c5ce
Sundeep Ghuman [Thu, 15 Jun 2017 05:39:49 +0000 (05:39 +0000)]
Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1 am:
73df65acd7
am:
85a6bfdc02
Change-Id: Ic5591e4563c7c8421d9b99e683a45935e3e2691e
Android Build Merger (Role) [Thu, 15 Jun 2017 05:33:38 +0000 (05:33 +0000)]
Merge "Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1 am:
7dd2635319" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Thu, 15 Jun 2017 05:31:17 +0000 (05:31 +0000)]
Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1
am:
73df65acd7
Change-Id: I54d8b86ee9d65bf1ed8337791de9d116017214c9
Sundeep Ghuman [Thu, 15 Jun 2017 05:31:16 +0000 (05:31 +0000)]
Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1
am:
7dd2635319
Change-Id: I03e5fe3084e891e1aa2b9d6446b77eddaf7b1ccb