OSDN Git Service
fionaxu [Tue, 8 Aug 2017 09:08:42 +0000 (09:08 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev am:
93bf6200eb
am:
a40b8b7431
Change-Id: Iff48615957699f5ccf14bf092a7ed9766637524e
fionaxu [Tue, 8 Aug 2017 09:02:23 +0000 (09:02 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
am:
93bf6200eb
Change-Id: I1a506e9f8dae6fd76c74c3f9d7f93c40ce64a387
Hugo Benichi [Tue, 8 Aug 2017 09:01:19 +0000 (09:01 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am:
c06dbc114f -s ours am:
607f74b317 -s ours am:
082a9fa173
am:
c9ef02ca17
Change-Id: I6c4f680e2fc5615c11be8659333ec78a440ef158
TreeHugger Robot [Tue, 8 Aug 2017 08:57:16 +0000 (08:57 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
Hugo Benichi [Tue, 8 Aug 2017 08:55:42 +0000 (08:55 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am:
c06dbc114f -s ours am:
607f74b317 -s ours
am:
082a9fa173
Change-Id: If6ad00b1ee146f73ee62a5a7d5e3992ee29b6fd2
Hugo Benichi [Tue, 8 Aug 2017 08:48:56 +0000 (08:48 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am:
c06dbc114f -s ours
am:
607f74b317 -s ours
Change-Id: I78b9a3639321a15a26eff3abd4c80a9d84d9229c
Hugo Benichi [Tue, 8 Aug 2017 08:40:40 +0000 (08:40 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
am:
c06dbc114f -s ours
Change-Id: Idfc34008bf7d9c636ee67fed3f07552be688052d
Treehugger Robot [Tue, 8 Aug 2017 08:30:03 +0000 (08:30 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
Hugo Benichi [Tue, 8 Aug 2017 07:53:41 +0000 (07:53 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk" am:
05be68698b am:
a22fbf4534 am:
db554dfdfa
am:
86e04cb370
Change-Id: I6366148e3da573aa95e5b8e3016eab55e56efe23
Hugo Benichi [Tue, 8 Aug 2017 07:47:07 +0000 (07:47 +0000)]
Merge "Fix flaky IpPrefixTest." am:
2cbce2cb27 -s ours am:
7d752a872d -s ours am:
ffcc739a39 -s ours
am:
a432741940 -s ours
Change-Id: I0d7ce75411072adb90c449d71c48b163c06ee290
Hugo Benichi [Tue, 8 Aug 2017 07:46:56 +0000 (07:46 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk" am:
05be68698b am:
a22fbf4534
am:
db554dfdfa
Change-Id: I68339b6b5efab5ac8fe72bbbd7c96da59bc24b2e
Hugo Benichi [Tue, 8 Aug 2017 07:40:11 +0000 (07:40 +0000)]
Merge "Fix flaky IpPrefixTest." am:
2cbce2cb27 -s ours am:
7d752a872d -s ours
am:
ffcc739a39 -s ours
Change-Id: I64b9214694132f874d5546b4ade1917524db50d7
Hugo Benichi [Tue, 8 Aug 2017 07:40:02 +0000 (07:40 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk" am:
05be68698b
am:
a22fbf4534
Change-Id: I64895a50baca163588ce863f7fb93fad31d7f55b
Hugo Benichi [Tue, 8 Aug 2017 07:34:42 +0000 (07:34 +0000)]
Merge "Fix flaky IpPrefixTest." am:
2cbce2cb27 -s ours
am:
7d752a872d -s ours
Change-Id: I216b50a8d0f51f2f731b17598b205a7b0ad65324
Hugo Benichi [Tue, 8 Aug 2017 07:34:39 +0000 (07:34 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk"
am:
05be68698b
Change-Id: Iff94ca7089c074cc44f8e09cbce01f741c0b5c67
Hugo Benichi [Tue, 8 Aug 2017 07:32:09 +0000 (07:32 +0000)]
Merge "Add OWNERS to com.android.server.net" am:
0a00151bd1 am:
24f5d8f866 am:
847647b96b
am:
5eea8365da
Change-Id: Id173ca5a2e3d3cc817b55b6f55b29959f9a8ced1
Hugo Benichi [Tue, 8 Aug 2017 07:28:32 +0000 (07:28 +0000)]
Merge "Fix flaky IpPrefixTest."
am:
2cbce2cb27 -s ours
Change-Id: Iabc8a365a6c18c19754da7ddfcc0385eb5b0f768
Hugo Benichi [Tue, 8 Aug 2017 07:27:06 +0000 (07:27 +0000)]
Merge "Add OWNERS to com.android.server.net" am:
0a00151bd1 am:
24f5d8f866
am:
847647b96b
Change-Id: Ia8593f827788d8b19366694fccaeeb79105995d2
Hugo Benichi [Tue, 8 Aug 2017 07:21:41 +0000 (07:21 +0000)]
Merge "Add OWNERS to com.android.server.net" am:
0a00151bd1
am:
24f5d8f866
Change-Id: Id6986ccea642c2e78e6b7493cec553a9fe53971f
Hugo Benichi [Tue, 8 Aug 2017 07:20:07 +0000 (07:20 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk"
Treehugger Robot [Tue, 8 Aug 2017 07:16:48 +0000 (07:16 +0000)]
Merge "Fix flaky IpPrefixTest."
Hugo Benichi [Tue, 8 Aug 2017 07:16:12 +0000 (07:16 +0000)]
Merge "Add OWNERS to com.android.server.net"
am:
0a00151bd1
Change-Id: Ib9938dd15a173d459ca67e5dc19430da57c29115
Treehugger Robot [Tue, 8 Aug 2017 07:07:25 +0000 (07:07 +0000)]
Merge "Add OWNERS to com.android.server.net"
Hugo Benichi [Fri, 4 Aug 2017 03:12:25 +0000 (12:12 +0900)]
DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies
Rational for do not merge: the list of native libraries needed in
Android.mk is not consistent at the moment for aosp master and for
internal branches. Furthermore it is not consistent within internal
branches either. This patch only attempts to fix the tests of the
branches where it matters for development. Otherwise the cost of merge
conflicts makes it undesirable.
Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708
(cherry pick from commit
99e8ab6e46eec5dbd1b059b3732672d537b3cf34)
Change-Id: Ic732b3dafc3497235e455b8748ac4f99cf02b221
Hugo Benichi [Mon, 7 Aug 2017 01:27:04 +0000 (10:27 +0900)]
Add OWNERS to com.android.server.net
Test: build
Change-Id: I9236489814103ab20b077ebfc30155dcdb66d411
Sungsoo Lim [Tue, 8 Aug 2017 06:25:02 +0000 (06:25 +0000)]
Merge "Start ARC action when setSystemAudioMode" into oc-mr1-dev
am:
3c8b5d1cf2
Change-Id: Ic285348252030d6bf443ecec7458b20810ee9cf4
TreeHugger Robot [Tue, 8 Aug 2017 06:18:56 +0000 (06:18 +0000)]
Merge "Start ARC action when setSystemAudioMode" into oc-mr1-dev
Bookatz [Tue, 8 Aug 2017 06:11:30 +0000 (06:11 +0000)]
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev
am:
26e02181a0
Change-Id: I5bbd8149000295ffdbad32a8e1877669e7642005
TreeHugger Robot [Tue, 8 Aug 2017 06:03:18 +0000 (06:03 +0000)]
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev
Hugo Benichi [Thu, 10 Nov 2016 13:45:56 +0000 (22:45 +0900)]
Fix flaky IpPrefixTest.
Test: IpPrefixTest passes
Bug:
32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645
(cherry pick from commit
32c687040301cb3601fd110281a742159a963aa9)
Change-Id: Ibaf11aae9b13af868bebff820c9e7615b63c8eb2
Hugo Benichi [Tue, 8 Aug 2017 01:46:57 +0000 (10:46 +0900)]
Connectivity OWNERS: let owners modify Android.mk
Since per-file overwrites the directory default, just allowing
build.master@android.com for Android.mk with a per-file rule prevents
the owners of the directory to modify Android.mk files without bypassing
OWNERS check in gerrit.
This patch fixes this issue for Connectivity OWNERS files by explicitly
listing Connectivity members for a few Android.mk files.
Test: build
Change-Id: I9c2a2519c3e7dd27e66334b090e074968b408cbc
Todd Poynor [Tue, 8 Aug 2017 01:23:35 +0000 (01:23 +0000)]
Merge "thermalservice: Add ThermalService java interfaces" into oc-mr1-dev
am:
590f519f24
Change-Id: I1397add21609288770d46f21d8a23cf55e6e9a75
TreeHugger Robot [Tue, 8 Aug 2017 01:15:41 +0000 (01:15 +0000)]
Merge "thermalservice: Add ThermalService java interfaces" into oc-mr1-dev
Philip P. Moltmann [Tue, 8 Aug 2017 00:54:48 +0000 (00:54 +0000)]
Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev
am:
fdaad13803
Change-Id: I2eaaf989fb6e5f006edd974d56386731d778e604
Android Build Merger (Role) [Tue, 8 Aug 2017 00:52:25 +0000 (00:52 +0000)]
Merge changes from topic 'am-
686aabc46c2945ceb8bf69ea0c8d1dc7' into oc-mr1-dev-plus-aosp
* changes:
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev am:
673e3c41ec am:
5f862061ae
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev am:
c7d24aed82 am:
44bdd5cce4
Matthew Ng [Tue, 8 Aug 2017 00:50:04 +0000 (00:50 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev am:
673e3c41ec
am:
5f862061ae
Change-Id: I598cf26707c54ca1880bf7e4a0e8e8b30ca97da4
Matthew Ng [Tue, 8 Aug 2017 00:49:21 +0000 (00:49 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev am:
c7d24aed82
am:
44bdd5cce4
Change-Id: I0d4c3f0f835699c2f08eb52f0c9f35f435e587fb
Matthew Ng [Tue, 8 Aug 2017 00:47:46 +0000 (00:47 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev am:
673e3c41ec
am:
b9bfe2865f
Change-Id: I0840526f8b5c283354ebf0537336d85646376fea
Matthew Ng [Tue, 8 Aug 2017 00:46:51 +0000 (00:46 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev am:
c7d24aed82
am:
58e0363930
Change-Id: I3c810fed6bec57d40288564673cfa8830754da31
TreeHugger Robot [Tue, 8 Aug 2017 00:45:48 +0000 (00:45 +0000)]
Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev
* changes:
Allow to read all params used to create session.
Allow to transfer+seal a install session
Tomasz Wasilczyk [Tue, 8 Aug 2017 00:41:04 +0000 (00:41 +0000)]
Merge "Change VENDOR program types to range." into oc-mr1-dev
am:
ecacb9850c
Change-Id: I702d77c693303f903d1daabd8746a4d5ea4cfb5f
Matthew Ng [Tue, 8 Aug 2017 00:39:26 +0000 (00:39 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
am:
673e3c41ec
Change-Id: Iedcf8f27eacdba8ad96a4753fb108f4539930fb9
Matthew Ng [Tue, 8 Aug 2017 00:38:46 +0000 (00:38 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
am:
673e3c41ec
Change-Id: If07c7fb08169ab3084fdf97d8190285220efe0f9
Matthew Ng [Tue, 8 Aug 2017 00:38:32 +0000 (00:38 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
am:
c7d24aed82
Change-Id: I96ed9a5f7f295b1a3f3a9199547945e4958a34a3
Matthew Ng [Tue, 8 Aug 2017 00:37:50 +0000 (00:37 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
am:
c7d24aed82
Change-Id: I36fe4faa536412c3de98b01034f2f22e95d15155
Tomasz Wasilczyk [Tue, 8 Aug 2017 00:35:09 +0000 (00:35 +0000)]
Merge "Change VENDOR program types to range." into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
Calin Juravle [Tue, 8 Aug 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev
am:
284b584499
Change-Id: Ib8f8156b0610dc7aaf892c1d049c94232938a565
Calin Juravle [Tue, 8 Aug 2017 00:17:44 +0000 (00:17 +0000)]
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev
Felipe Leme [Mon, 7 Aug 2017 23:53:09 +0000 (23:53 +0000)]
Merge "Minor Autofill changes after API council review." into oc-mr1-dev
am:
be3e4a6285
Change-Id: Ia2c1c3cf1987ac0567a6d04e8f9c10d4f2b62539
Sudheer Shanka [Mon, 7 Aug 2017 23:43:22 +0000 (23:43 +0000)]
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
am:
e913d8235c
Change-Id: I7915fe5d7df2b2ac49f2b97afba486782a1c8208
Zheng Zhang [Mon, 7 Aug 2017 23:35:59 +0000 (23:35 +0000)]
Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev
am:
3f02441588
Change-Id: Idf7f29533bad1eb6c6b9ea8dc1ca9c60e63103d3
TreeHugger Robot [Mon, 7 Aug 2017 23:35:56 +0000 (23:35 +0000)]
Merge "Minor Autofill changes after API council review." into oc-mr1-dev
Adam Bookatz [Mon, 7 Aug 2017 23:33:44 +0000 (23:33 +0000)]
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev
am:
0a1ae1bc56
Change-Id: Ie4b8379cd5bc6622ecc07868cdcf4eac0af1cf61
Sudheer Shanka [Mon, 7 Aug 2017 23:32:50 +0000 (23:32 +0000)]
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 23:28:50 +0000 (23:28 +0000)]
Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev
Adam Bookatz [Mon, 7 Aug 2017 23:22:31 +0000 (23:22 +0000)]
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev
Todd Poynor [Fri, 26 May 2017 00:53:21 +0000 (17:53 -0700)]
thermalservice: Add ThermalService java interfaces
Binder service ThermalService broadcasts thermal events to registered
listeners.
Test: manual: marlin with modified thermal-engine.conf and temporary
java thermal event listener
Bug:
30982366
Change-Id: I11f7fd18feff3b9af0eecc3fd3a13d54c0b97ff0
(cherry picked from commit
dd05582eabb6809899e3187d3afc1e97e148fdb1)
Yohei Yukawa [Mon, 7 Aug 2017 22:39:25 +0000 (22:39 +0000)]
Merge "Bind SpellCheckerService as IMPORTANT_BACKGROUND" into oc-mr1-dev
am:
cb921c1efc
Change-Id: I2245b196229aa590df1c65c0b44be1bab6f85e96
Yohei Yukawa [Mon, 7 Aug 2017 22:34:51 +0000 (22:34 +0000)]
Merge "Bind SpellCheckerService as IMPORTANT_BACKGROUND" into oc-mr1-dev
Android Build Merger (Role) [Mon, 7 Aug 2017 22:32:40 +0000 (22:32 +0000)]
Merge "Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101 am:
66994114e7" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 7 Aug 2017 22:31:33 +0000 (22:31 +0000)]
Merge "Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101 am:
cdcc9dd0dd" into oc-mr1-dev-plus-aosp
Andrii Kulian [Mon, 7 Aug 2017 22:31:03 +0000 (22:31 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101
am:
66994114e7
Change-Id: I58305f008170c734e1c7291ff53f16e87776fe08
Andrii Kulian [Mon, 7 Aug 2017 22:29:34 +0000 (22:29 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101
am:
cdcc9dd0dd
Change-Id: I1391ee22429cbc3cefe7f16fb9e2cc76d48ec870
Adam Lesinski [Mon, 7 Aug 2017 22:28:43 +0000 (22:28 +0000)]
Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev
am:
a5fc11d78e
Change-Id: Id751b5a4c087fa062a31e88e153302a326fe34a8
Adam Lesinski [Mon, 7 Aug 2017 22:25:35 +0000 (22:25 +0000)]
Merge "AAPT2: Ensure style strings are always first in StringPool" into oc-mr1-dev
am:
0dcfee3154
Change-Id: Id820dff95bf26f0186f64b31a14f4032bd3f76ec
Andrii Kulian [Mon, 7 Aug 2017 22:21:08 +0000 (22:21 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
am:
cbdaf04101
Change-Id: I9ce5cf5aea7f0fd93fbe24664bbd583d5057d3e6
Andrii Kulian [Mon, 7 Aug 2017 22:20:21 +0000 (22:20 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
am:
cbdaf04101
Change-Id: I121cca690aca4f2c9552440a47165b34fcb26d8b
TreeHugger Robot [Mon, 7 Aug 2017 22:18:11 +0000 (22:18 +0000)]
Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 22:17:50 +0000 (22:17 +0000)]
Merge "AAPT2: Ensure style strings are always first in StringPool" into oc-mr1-dev
Andrii Kulian [Mon, 7 Aug 2017 22:07:22 +0000 (22:07 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
Hangyu Kuang [Mon, 7 Aug 2017 21:37:53 +0000 (21:37 +0000)]
Merge "media: Address api council comments." into oc-mr1-dev
am:
d3cef1bf7c
Change-Id: If50d3455d37915935aa7f8141aa99221374b3048
Yi Jin [Mon, 7 Aug 2017 21:26:37 +0000 (21:26 +0000)]
Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive" into oc-mr1-dev
am:
8ce50255c5
Change-Id: I0ece40e7e6fb98d3c029bd26d6b35fbcb1ee66c0
Makoto Onuki [Mon, 7 Aug 2017 21:24:33 +0000 (21:24 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
am:
ce3e863f31
Change-Id: I67798ee72499d25bed4fc902baf7e92909dffdca
TreeHugger Robot [Mon, 7 Aug 2017 21:20:54 +0000 (21:20 +0000)]
Merge "media: Address api council comments." into oc-mr1-dev
Zheng Zhang [Mon, 7 Aug 2017 20:51:23 +0000 (13:51 -0700)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
Bug:
64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb
TreeHugger Robot [Mon, 7 Aug 2017 21:10:49 +0000 (21:10 +0000)]
Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 21:05:42 +0000 (21:05 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 20:22:03 +0000 (20:22 +0000)]
Merge "Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"" into oc-mr1-dev
am:
e2dc2d9e9a
Change-Id: I10d6289b59c99cacc35fbed9295160cba1a7f6de
Colin Cross [Mon, 7 Aug 2017 20:15:17 +0000 (20:15 +0000)]
Merge "Use class retention for VisibleForTesting annotations" am:
5724841581 am:
94d5456d0e am:
a5538805d9
am:
2130e26bca
Change-Id: I3c4199fa186374bc8adc2d3068bba102c6da4df8
Adrian Roos [Mon, 7 Aug 2017 20:12:57 +0000 (20:12 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev am:
2b7fbd010e
am:
94fa7f2194
Change-Id: Ie868bf3f76fa6e38137593a77d0b35a14b4ab1bb
Peter Qiu [Mon, 7 Aug 2017 20:12:05 +0000 (20:12 +0000)]
Merge "Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"" into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 20:06:20 +0000 (20:06 +0000)]
Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"
This reverts commit
84933321668c79202de39ea491329f7234ce6ee5.
Change-Id: Ibecf24689952d4888269863ff02d8c97e14a0c31
Colin Cross [Mon, 7 Aug 2017 19:56:23 +0000 (19:56 +0000)]
Merge "Use class retention for VisibleForTesting annotations" am:
5724841581 am:
94d5456d0e
am:
a5538805d9
Change-Id: I83547deec96de1a26318c30d9ed01865d1be4254
Colin Cross [Mon, 7 Aug 2017 19:44:57 +0000 (19:44 +0000)]
Merge "Use class retention for VisibleForTesting annotations" am:
5724841581
am:
94d5456d0e
Change-Id: I3309ee0b936eb9d36a453beb084be31e046c1bf5
Colin Cross [Mon, 7 Aug 2017 19:32:21 +0000 (19:32 +0000)]
Merge "Use class retention for VisibleForTesting annotations"
am:
5724841581
Change-Id: Iaa9262ad627b49d58b46760d7aecd3a985c3a79a
Treehugger Robot [Mon, 7 Aug 2017 19:17:33 +0000 (19:17 +0000)]
Merge "Use class retention for VisibleForTesting annotations"
Adrian Roos [Mon, 7 Aug 2017 18:53:04 +0000 (18:53 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev am:
2b7fbd010e
am:
ceb0963f44
Change-Id: Ib27b4d5f6252fc5349e391dbb375834d0e42b80b
Adrian Roos [Mon, 7 Aug 2017 18:41:07 +0000 (18:41 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
am:
2b7fbd010e
Change-Id: If4ed2779d3fd1a2f2b3f2dc65d0d7a9a1d7d72bc
Adrian Roos [Mon, 7 Aug 2017 18:41:04 +0000 (18:41 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
am:
2b7fbd010e
Change-Id: I2956ecaff7b471af05e9baa275d7ea0742bfb4eb
Peter Qiu [Mon, 7 Aug 2017 18:36:58 +0000 (18:36 +0000)]
Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
am:
cbf16572eb
Change-Id: I6fbc6670e35c51c8db2352df933e5018261fa344
TreeHugger Robot [Mon, 7 Aug 2017 18:27:57 +0000 (18:27 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
Matthew Ng [Wed, 2 Aug 2017 21:00:59 +0000 (14:00 -0700)]
Reset wait for transition state to false when recents goes invisible
From ag/
2572257, this change will ensure the transition wait flag to be
false when recents runs "onStop" or when it becomes invisible. This
should fix edge cases when a user goes from Recents to somewhere that
is not a fullscreen app (like home). Resetting the state should allow
users to use the recents button without getting blocked.
There is only two locations where the flag is set to true, when user
starts recents and when an app is started from recents. When a user goes
from recents to home with the recents button (when the phone gets into a
wierd state), then the flag is true but home does not reset the flag
because the old change expects a non-home app to start. Now whenever
recents is dismissed, the flag will be reset.
Fixes:
37277853
Bug:
64098508
Test: start recents with apps in it, go to guest account, start apps in
recents, go back to main account, unlock keyguard, press recents button
to dismiss recents (do not press home or back), it will go to home,
press recents again
Change-Id: I07c292d701a621685c836a4f6040864377f0a3dd
TreeHugger Robot [Mon, 7 Aug 2017 18:19:59 +0000 (18:19 +0000)]
Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
Colin Cross [Fri, 4 Aug 2017 23:39:05 +0000 (16:39 -0700)]
Use class retention for VisibleForTesting annotations
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests. The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation. When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.
Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.
Bug:
64365384
Test: m -j MtpDocumentsProvider &&
javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot
Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
Merged-In: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
(cherry picked from commit
8e846143ddc285117d391561de7abd670078d27f)
Adam Lesinski [Mon, 7 Aug 2017 17:58:43 +0000 (17:58 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am:
242c22c900
am:
62e72c21f5
Change-Id: I911580693ea5fcba1581726a837bbad5104402bf
Adam Lesinski [Mon, 7 Aug 2017 17:51:36 +0000 (17:51 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am:
242c22c900
am:
dc901a6318
Change-Id: Ic9ff5a40d228396734b314f8e6bd68d7152986cd
Philip P. Moltmann [Thu, 3 Aug 2017 21:35:56 +0000 (14:35 -0700)]
Allow to read all params used to create session.
So that they can be verified by the app calling commit().
This really only makes sense if the app calling commit is different from
the app that created the session.
Bug:
37281396
Test: cts-tradefed run cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
Installed and uninstalled packages via the PackageInstaller app
Change-Id: I5c954ca59b7582555bea847f3ddbba0aeefba301
Philip P. Moltmann [Wed, 19 Jul 2017 17:06:14 +0000 (10:06 -0700)]
Allow to transfer+seal a install session
... so that one package can supply the data and another one can issue
the commit.
Also allow reading of sealed sessions.
Also lock more in PackageInstallerSession so that we can be sure the
session is not used by the old package anymore once transferred and that
all calls into the session work on consistent data.
Bug:
37281396
Test: cts-tradefed run cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
Installed and uninstalled packages via the PackageInstaller app
Installed and uninstalled packages via the Google Play Store
Change-Id: Id4b7a0071d703b7d18c9f5bf2bd15ebf67086d07
OSDN Git Service
