OSDN Git Service
Marco Nelissen [Fri, 16 Jun 2017 17:47:09 +0000 (17:47 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours am:
009b3c6aec -s ours
am:
acbd7ba4aa -s ours
Change-Id: I17c0c2beb412135905d48636971ad2099b23fcc7
Marco Nelissen [Fri, 16 Jun 2017 17:38:19 +0000 (17:38 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours am:
21caf4aee4 -s ours
am:
009b3c6aec -s ours
Change-Id: Ied441cf591abb8933a5601c6d36066e0288dfbd7
Marco Nelissen [Fri, 16 Jun 2017 17:24:37 +0000 (17:24 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours am:
a9bf75f50c -s ours
am:
21caf4aee4 -s ours
Change-Id: I25f1f4394b6a5a6b3708df13be41299865e76d52
Marco Nelissen [Fri, 16 Jun 2017 17:12:09 +0000 (17:12 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours am:
3cd244e872 -s ours
am:
a9bf75f50c -s ours
Change-Id: Ib75388665c3586c09e963917bc54b020aae22dce
Marco Nelissen [Fri, 16 Jun 2017 16:59:57 +0000 (16:59 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours am:
4e5ed845c7 -s ours
am:
3cd244e872 -s ours
Change-Id: I256e1413df73fd577708d5dcb84074e3a8ed61ab
Marco Nelissen [Fri, 16 Jun 2017 16:51:14 +0000 (16:51 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours am:
035e2a5c37 -s ours
am:
4e5ed845c7 -s ours
Change-Id: Iae9f79e4b91c4ef5e844259709e3055607a781b8
Marco Nelissen [Fri, 16 Jun 2017 16:41:20 +0000 (16:41 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours am:
ce4c7df6a0 -s ours
am:
035e2a5c37 -s ours
Change-Id: Ib6f84a832e27329e0eabf000b89e93145c43a31a
Marco Nelissen [Fri, 16 Jun 2017 16:26:30 +0000 (16:26 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours
am:
ce4c7df6a0 -s ours
Change-Id: I1fb798481ca56b8c81386792b5642a544aae1c7e
Marco Nelissen [Fri, 16 Jun 2017 16:19:02 +0000 (16:19 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours
am:
45cd809caa -s ours
Change-Id: Idd7b2d2536d1c25072794ba228f33fc2459f2aaa
Marco Nelissen [Fri, 16 Jun 2017 16:11:01 +0000 (16:11 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours
am:
23118a9b77 -s ours
Change-Id: Id314511cf3e6af08e0f00e84e8945ea404b85c6a
Marco Nelissen [Fri, 16 Jun 2017 16:02:19 +0000 (16:02 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours
am:
49fc959be3 -s ours
Change-Id: I0eb248911ce1a582a4939e2bd5419659c586128f
Marco Nelissen [Fri, 16 Jun 2017 15:51:48 +0000 (15:51 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours
am:
398d50feeb -s ours
Change-Id: Ide31821909dde91443cdf650216a6ada7277ce9a
Marco Nelissen [Fri, 16 Jun 2017 15:43:46 +0000 (15:43 +0000)]
libmedia_jni.so doesn't need libjhead.so
am:
9a4a34afd8 -s ours
Change-Id: I557d7e96401b742d916e2eef5aa03949018382c7
Bill Yi [Fri, 16 Jun 2017 15:21:00 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d97c62a1da -s ours
Change-Id: I7414e3510ce29720a40a55c8dbd69c9a34be6d45
TreeHugger Robot [Fri, 16 Jun 2017 15:12:30 +0000 (15:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Neil Fuller [Fri, 16 Jun 2017 15:03:10 +0000 (15:03 +0000)]
Merge "Track movement of some libcore/tzdata files" am:
2ed8b06173
am:
de45dab9ed -s ours
Change-Id: I75073397ee931b4b10c11e369d0081c2b559c91a
Neil Fuller [Fri, 16 Jun 2017 14:51:10 +0000 (14:51 +0000)]
Merge "Track movement of some libcore/tzdata files"
am:
2ed8b06173
Change-Id: Icfe3e6bb1e0d19be462fb47c23cba1cf77c6bf20
Neil Fuller [Fri, 16 Jun 2017 14:37:15 +0000 (14:37 +0000)]
Merge "Track movement of some libcore/tzdata files"
Erik Kline [Fri, 16 Jun 2017 14:10:44 +0000 (14:10 +0000)]
Merge "Fixes for tetheroffload crashes" am:
5ac7a03f9f
am:
eeb0b31afa
Change-Id: I58c467be3482e01f84c9860e2b9d4b03713c1dbd
Erik Kline [Fri, 16 Jun 2017 14:03:10 +0000 (14:03 +0000)]
Merge "Fixes for tetheroffload crashes"
am:
5ac7a03f9f
Change-Id: I08406513912c9fbd383625f10837085abb5c0516
Treehugger Robot [Fri, 16 Jun 2017 13:49:56 +0000 (13:49 +0000)]
Merge "Fixes for tetheroffload crashes"
Android Build Merger (Role) [Fri, 16 Jun 2017 13:38:50 +0000 (13:38 +0000)]
Merge "Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev am:
ded5608f18" into oc-dev-plus-aosp
Julia Reynolds [Fri, 16 Jun 2017 13:36:32 +0000 (13:36 +0000)]
Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev
am:
ded5608f18
Change-Id: I32546aa6f7276a26b4e0419f83253110d83da01d
Julia Reynolds [Fri, 16 Jun 2017 13:30:29 +0000 (13:30 +0000)]
Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev
Bill Yi [Fri, 16 Jun 2017 12:16:09 +0000 (05:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icb9547e4d5fb47bfab83f8012358047189787fda
Auto-generated-cl: translation import
Erik Kline [Thu, 15 Jun 2017 09:06:34 +0000 (18:06 +0900)]
Fixes for tetheroffload crashes
Now that we can talk to the HALs (with some out of tree CLs and
"setenforce 0"), several crashes were encountered.
Fixes here include:
- avoid hidl_handle move semantics
- check HIDL method status return value (isOk())
- convert Java short port numbers to ints
- don't pass nulls to HIDL where Strings are required
(limitations in parceling)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- "setenforce 0" and start tethering
Bug:
29337859
Bug:
32163131
Merged-In: I5fa930be0c9eda491cf17bd4de9b55ab33672d25
Merged-In: Id1037d22826f4d426bccfa17dce0962c54518d64
Change-Id: I91314440c3a04e5f2502579b5f06dac9f25cf0cd
(cherry picked from commit
1185459c4169891bd7550655218e738c8bf1abe2)
Neil Fuller [Tue, 13 Jun 2017 14:12:17 +0000 (15:12 +0100)]
Track movement of some libcore/tzdata files
Some files in libcore/tzdata are moving to system/timezone
under the package com.android.timezone.distro.
To run tests:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above.
Bug:
31008728
Merged-In: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Change-Id: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Neil Fuller [Tue, 13 Jun 2017 14:12:17 +0000 (15:12 +0100)]
Track movement of some libcore/tzdata files
Some files in libcore/tzdata are moving to system/timezone
under the package com.android.timezone.distro.
To run tests:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above.
Bug:
31008728
Change-Id: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Shunta Sato [Fri, 16 Jun 2017 01:56:05 +0000 (01:56 +0000)]
Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev
am:
892cd3e1e6
Change-Id: Ie1011f5c27008e50cdf9430669ef1d3ceb1f38e9
TreeHugger Robot [Fri, 16 Jun 2017 01:47:07 +0000 (01:47 +0000)]
Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev
Jorim Jaggi [Fri, 16 Jun 2017 01:13:34 +0000 (01:13 +0000)]
Merge "Don't even think about changing keyguard transit" into oc-dev
am:
3e3bb5f762
Change-Id: I5ad8b077de7bbe692ac22e07fd2fb7ccb9264500
TreeHugger Robot [Fri, 16 Jun 2017 01:04:09 +0000 (01:04 +0000)]
Merge "Don't even think about changing keyguard transit" into oc-dev
Dianne Hackborn [Fri, 16 Jun 2017 00:54:21 +0000 (00:54 +0000)]
Merge "Fix issue #
62524613: Background limitation is not working as expected..." into oc-dev
am:
2b20d552bd
Change-Id: Id76ca5b865603af8188c4f85ed77626bd21711c3
TreeHugger Robot [Fri, 16 Jun 2017 00:46:45 +0000 (00:46 +0000)]
Merge "Fix issue #
62524613: Background limitation is not working as expected..." into oc-dev
Jeff Hao [Fri, 16 Jun 2017 00:01:28 +0000 (00:01 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev
am:
08b3fd966c
Change-Id: Iefd9ddb5703a632438a4ef98bc9ba59e04c35206
Jeff Hao [Thu, 15 Jun 2017 23:53:47 +0000 (23:53 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." am:
8a945baf4a
am:
47b1f54316
Change-Id: Ie04409229e2f118f1785db46e2c6f3fb0aa7603e
TreeHugger Robot [Thu, 15 Jun 2017 23:52:01 +0000 (23:52 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev
Jeff Hao [Thu, 15 Jun 2017 23:43:32 +0000 (23:43 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only."
am:
8a945baf4a
Change-Id: I7c2733ac9dfe60ed8a629d5d312b760c53baa76e
Treehugger Robot [Thu, 15 Jun 2017 23:32:57 +0000 (23:32 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only."
Todd Kennedy [Thu, 15 Jun 2017 22:17:57 +0000 (22:17 +0000)]
Merge "don't block uninstall of unknown packages" into oc-dev
am:
627fbf8157
Change-Id: I55a0b4906870f08de6b72ef601c151859fc0ccfb
TreeHugger Robot [Thu, 15 Jun 2017 22:05:43 +0000 (22:05 +0000)]
Merge "don't block uninstall of unknown packages" into oc-dev
Winson Chung [Thu, 15 Jun 2017 21:51:52 +0000 (21:51 +0000)]
Merge "Update TV to show custom actions." into oc-dev
am:
1a01d1298f
Change-Id: I841d27de83656a1f8b3bf279401217348569fea7
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
Dianne Hackborn [Thu, 15 Jun 2017 21:33:16 +0000 (14:33 -0700)]
Fix issue #
62524613: Background limitation is not working as expected...
...for most background services.
Whoops, was only stopping the first service it found!
Test: bit CtsAppTestCases:ActivityManagerProcessStateTest
Change-Id: I42af2872afed8b49fab0f53eff36b62e55d23409
Julia Reynolds [Thu, 15 Jun 2017 19:24:01 +0000 (15:24 -0400)]
Fix two IndexOutOfBoundsException crashes.
Do not remove (sometimes multiple) items from lists
you are iterating over.
Test: runtest systemui-notification
Change-Id: I130cc63ae2f5721e7b434006f4306e0b1eaef77d
Fixes:
62622503
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
Winson Chung [Thu, 15 Jun 2017 21:05:44 +0000 (21:05 +0000)]
Merge "Update TV to show custom actions." into oc-dev
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
Jorim Jaggi [Thu, 15 Jun 2017 19:10:38 +0000 (15:10 -0400)]
Don't even think about changing keyguard transit
When camera was launched with a lockscreen wallpaper set, the
wallpaper target was launcher in that case, which was also in
mClosingApps because it was first getting shown by keyguard
exit but then immediately hidden by starting the camera,
before the transition started.
Now since lockscreen wasn't the wallpaper target, launcher was
already for some reason, and we changed the transit to
WALLPAPER_CLOSE as a window with the wallpaper target was in
mClosingApps.
Fix this by never ever changing away from keyguard transits.
Test: go/wm-smoke
Test: ActivityManagerTransitionSelectionTests
Test: Set lockscreen wallpaper, set animation duration scale to
0.5, insert a random sleep statement in SystemUI, launch
camera from screen off while in trusted state and camera
wasn't running before.
Fixes:
37677242
Change-Id: I984b66d7f117034f3d55591284dd822b5ec76cbd
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
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
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: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
Jeff Hao [Tue, 13 Jun 2017 18:09:10 +0000 (11:09 -0700)]
When updating a split app, copy compiled files from base.apk only.
This fixes issues with some splits failing to be recompiled if they
haven't changed, but the dex files they depend on have.
The real fix will be for frameworks to generate the new expected
classpath and check in DexFile.getDexOptNeeded. Then we can undo
this change and copy over all the compiled split files again.
Bug:
62269291
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
(cherry-picked from commit
d1235f54d4943a0a3a920013a5875b5193bd0490)
Change-Id: I6e640a966ef3b43054d163326878adebe2329693
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
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
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:28:27 +0000 (16:28 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
am:
04298759fe
Change-Id: Ic53f15be9f13034e72fa056308e75fa0f4f310b0
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
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
Todd Kennedy [Thu, 15 Jun 2017 13:38:09 +0000 (06:38 -0700)]
don't block uninstall of unknown packages
If a package can't be found because it's not installed or it's
been filtered due to lack of visibility, don't claim the uninstall
should be blocked.
Change-Id: I932b77cea5749e5964ca626558bef51cdfdfd17b
Fixes:
62450984
Test: Manual
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
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:30:15 +0000 (06:30 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
am:
0823c9ff5c
Change-Id: Idb18d226c2d7d427fcbb61ff2218d5fd034cb63e
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: 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:23:48 +0000 (05:23 +0000)]
Merge "Create a staleScanResults bit." into oc-dev
am:
d1094717a1
Change-Id: Iab2e12d6c307dd57f14ff4830a5827d3c687fa04
TreeHugger Robot [Thu, 15 Jun 2017 05:19:46 +0000 (05:19 +0000)]
Merge "Create a staleScanResults bit." into oc-dev
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:12:45 +0000 (05:12 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev
am:
cbf19dcd76
Change-Id: If78cc6a4c6a0677e872a99aab9a607022b9008ad
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:05:21 +0000 (05:05 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev
Jorim Jaggi [Wed, 14 Jun 2017 23:04:59 +0000 (16:04 -0700)]
Remove snapshot when screen gets rotated in mean time
We also need to wait for windows that are not gone for layout, as
otherwise we'd unfreeze before the surface is actually created.
Test: go/wm-smoke
Test: Open Camera in landscape but home screen locked to portrait
Change-Id: I0fc7a016445e18af1eead292665702b768b4e95b
Fixes:
38261533
Jorim Jaggi [Thu, 15 Jun 2017 04:25:04 +0000 (04:25 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
am:
04c3cc6d12
Change-Id: I9d9afbb3161bd5abfa9d4fe2a98e00b643b602ea
Jorim Jaggi [Thu, 15 Jun 2017 04:19:48 +0000 (04:19 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
Lei Yu [Thu, 15 Jun 2017 02:12:28 +0000 (02:12 +0000)]
Merge "Revert the time zone display name logic" into oc-dev
am:
d9b1697b2d
Change-Id: I9f28c603a44290c49121bd06694a84dab73747be
Lei Yu [Thu, 15 Jun 2017 02:04:39 +0000 (02:04 +0000)]
Merge "Revert the time zone display name logic" into oc-dev
Jorim Jaggi [Thu, 15 Jun 2017 01:09:58 +0000 (18:09 -0700)]
Actually do not hold WM lock while closing transaction
Test: go/wm-smoke
Test: Quick switch 100x, observe no delay
Change-Id: I46022a23f749c52ba7f46e105679d728277970bd
Fixes:
62444483
Jorim Jaggi [Tue, 13 Jun 2017 18:54:04 +0000 (11:54 -0700)]
Use splashscreen if we can't fill horizontaly with snapshot
A gap at the right side of the snapshot looks pretty bad. Thus,
we use a splash screen in case there would be a gap on the right
side. However, we don't want to do this from recents as we'd
produce another flicker
Test: go/wm-smoke
Test: Open app portrait, go launcher, rotate, open app landscape
Test: Open app landscape, go launcher rotate, open app portrait
Fixes:
62094756
Change-Id: Iaf1fecced822685187477a4698fa6b67c6e485d7
Rob Carr [Thu, 15 Jun 2017 01:25:26 +0000 (01:25 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev
am:
03e61aa9bb
Change-Id: I6c53bff8ecc906658a3f8e81acfb6cb2e241121a
Rob Carr [Thu, 15 Jun 2017 01:18:17 +0000 (01:18 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev
Dianne Hackborn [Thu, 15 Jun 2017 00:30:15 +0000 (17:30 -0700)]
Work on issue #
36891897: Need to ensure foreground services...
...can't hide themselves
Tune the policies for when we tell about apps running in the
background after their services have stopped.
- If it ran while the screen was on, the time we require for it
to be running is much shorter (a couple seconds) as well as the
time we tell about it having run (with another tunable for the
minimum time we tell about this).
- If it has only run while the screen is off and stops a sufficient
amount of time before the screen goes on (currently a second) then
we will not show anything when the screen goes on.
- If it stops when the screen turns on, we will make sure the user
sees about it for a short period of time (currently 5 seconds).
Also includes some improved debug output about handler message
queues.
Test: manual
Change-Id: Iab438410d7182b2dfe4f9c1cce7069b26b34834c
Evan Laird [Wed, 14 Jun 2017 22:19:13 +0000 (22:19 +0000)]
Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev
am:
38778637ad
Change-Id: I8c25a0442ec55f2c6b79df0e6c47b436a9410267
TreeHugger Robot [Wed, 14 Jun 2017 22:10:51 +0000 (22:10 +0000)]
Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev
Sundeep Ghuman [Thu, 8 Jun 2017 01:11:39 +0000 (18:11 -0700)]
Create a staleScanResults bit.
This bit is set to true during stop tracking and will not change until
fresh scan results come in. This bit is used to prevent
onAccessPointsChanged callbacks from being invoked until other new scan
results are processed.
This is necessary to fix a UI issue in WifiSettings during app
resumption where sticky broadcasts from other intents come in before
a new scan result is available, causing us to clear out all shown APs
since the ScanResults are stale and thus removed from the picker.
Bug: b/
38212080
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I2f1fd84d1ab3461d9c8eac9511b90ba7533879c1
Robert Carr [Tue, 13 Jun 2017 19:41:53 +0000 (12:41 -0700)]
Correct errant entry in to DRAG_RESIZE_FREEFORM state.
Observing the logic in computeDragResizing(), we see that whenever an
AppWindowToken has frozen bounds we will enter the drag resizing
state. Furthermore, in setDragResizing() we see that if the docked
divider is not resizing, then we set ourselves as freeform
resizing. Also observe that AppWindowToken#startRelaunching
unconditionally freezes the bounds for tasks not in the freeform
stack. This means we are almost always entering the freeform resize
state while relaunching. Within computeDragResizing, the StackId check
and the MATCH_PARENT check have prevented this from being an issue in
too many places, espescially in pinned.
Once we are in this state, calculateSurfaceBounds() will force us to
0,0 as it thinks we are using the big surface approach.
There's no need to freeze the bounds if we weren't drag resizing at
the time that the app is relaunched, and this CL enforces that.
Bug:
62430780
Test: Manual repro from bug. To verify no regressions, create app with long delay in onResume (>1s) verify no flickers when releasing the docked divider and triggering a resize.
go/wm-smoke
Change-Id: I1d9bdfbe815ff48c884f933acd65612429d633ef
John Reck [Wed, 14 Jun 2017 20:25:03 +0000 (20:25 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev
am:
31443a17e8
Change-Id: Ic63e4f48ec55bce9f51089bc41481ab8805ae8c7
Daniel Sandler [Wed, 14 Jun 2017 20:18:56 +0000 (20:18 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev
am:
0e6a5f8d7e
Change-Id: I7e00e745c8aa2ddb6232747d4371dc3194be28ef
TreeHugger Robot [Wed, 14 Jun 2017 20:13:59 +0000 (20:13 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev
Daniel Sandler [Wed, 14 Jun 2017 20:12:32 +0000 (20:12 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev
Daniel Sandler [Tue, 13 Jun 2017 18:32:46 +0000 (18:32 +0000)]
Revert accidental API change to RemoteViews.
This reverts commit
7f09ce1a238ad5a647da913e275fd637ac75ab49 (but
retains the bug fix)
Change-Id: Ib4700ada5aa0b5dab7e43f895b48eb7058308869
Fixes:
62543637
Bug:
62181033