OSDN Git Service
Sunny Goyal [Wed, 6 Jun 2018 20:48:24 +0000 (13:48 -0700)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev am:
09dc071562
am:
ddedeb07ee
Change-Id: I5e6dd3c2aba17aec4a104ba5fa3155117f7d8e9c
Bill Yi [Wed, 6 Jun 2018 20:42:59 +0000 (13:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
6824fdb401 -s ours
am:
0bdc028743 -s ours
Change-Id: I67f84a0f4ad58814894ff357867c1930484fb7a0
Selim Cinek [Wed, 6 Jun 2018 20:41:40 +0000 (13:41 -0700)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev am:
a2537b7269
am:
96bc1cada2
Change-Id: If514fce8446cfb0a10380ce2db2b324575b13fd8
Bill Yi [Wed, 6 Jun 2018 20:36:01 +0000 (13:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
891fa6f6af -s ours
am:
0e82f4e238 -s ours
Change-Id: Id46bc303aff572011a89e6edf66cd6f80b292a43
Bill Yi [Wed, 6 Jun 2018 20:34:46 +0000 (13:34 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
d3e66495cd -s ours
am:
a2cbba495d -s ours
Change-Id: I8d286072e6ee6db15a92ed6b75321cc4cb30526e
Bill Yi [Wed, 6 Jun 2018 20:33:16 +0000 (13:33 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
158e38c3ed -s ours
am:
e80901e137 -s ours
Change-Id: I6b6384719002e1cc7f3616be1515b300156c8de6
Nicolas Geoffray [Wed, 6 Jun 2018 20:31:49 +0000 (13:31 -0700)]
Merge "Light grey bugbot updates." into pi-dev am:
bfa0ee12cf
am:
10c6f9f3b2
Change-Id: I0b1fac4240f194a64cb2eee04fbf12da553f5e3c
Sunny Goyal [Wed, 6 Jun 2018 20:30:25 +0000 (13:30 -0700)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev
am:
09dc071562
Change-Id: Ia42dfe2e058c9ea024b5a175d317b31a097f90cc
Mihai Popa [Wed, 6 Jun 2018 20:25:54 +0000 (13:25 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours am:
bb18c011aa -s ours am:
7478894a89 -s ours am:
999d9e1bf0 -s ours
am:
564fecfdb7 -s ours
Change-Id: I3a2d13dc94e3dbd5c7e30087e3fb3dcd4f02604f
Bill Yi [Wed, 6 Jun 2018 20:11:47 +0000 (13:11 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6824fdb401 -s ours
Change-Id: If5d1795cb37afef412bec06959647fe0fb09c7e3
Selim Cinek [Wed, 6 Jun 2018 20:11:13 +0000 (13:11 -0700)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev
am:
a2537b7269
Change-Id: I0a2e1042bc288ab62ab5a7e2e13c9e51336b35f7
Bill Yi [Wed, 6 Jun 2018 19:56:10 +0000 (12:56 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
891fa6f6af -s ours
Change-Id: I894b8cfb60049b3725e006c4ea81f6a265b53e7b
TreeHugger Robot [Wed, 6 Jun 2018 19:55:20 +0000 (19:55 +0000)]
Merge "Allow cross user usage event queries"
Bill Yi [Wed, 6 Jun 2018 19:54:56 +0000 (12:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
d3e66495cd -s ours
Change-Id: Ifd03b185b954339ccf05166a8cf323aeb74e064c
Bill Yi [Wed, 6 Jun 2018 19:52:50 +0000 (12:52 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
158e38c3ed -s ours
Change-Id: Ib49818f0037ce9e7ca80d9e2244de3f7bad7b0f3
Nicolas Geoffray [Wed, 6 Jun 2018 19:50:53 +0000 (12:50 -0700)]
Merge "Light grey bugbot updates." into pi-dev
am:
bfa0ee12cf
Change-Id: I7f43dc0677b00234fa33f5e01ebdc330a7568f05
Mihai Popa [Wed, 6 Jun 2018 19:45:38 +0000 (12:45 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours am:
bb18c011aa -s ours am:
7478894a89 -s ours
am:
999d9e1bf0 -s ours
Change-Id: I92c4e0edf71e7f92400395af8aa2828bb9ab395f
TreeHugger Robot [Wed, 6 Jun 2018 19:12:17 +0000 (19:12 +0000)]
Merge "Fix TalkBack do not announce subTitle for NightDisplayTile"
TreeHugger Robot [Wed, 6 Jun 2018 18:33:45 +0000 (18:33 +0000)]
Merge "Wean Statsd off BatteryStats: WakeupAlarm"
Julia Reynolds [Mon, 21 May 2018 18:11:43 +0000 (14:11 -0400)]
Allow cross user usage event queries
For multipackage requests, caller must be system uid or hold
interact_across_users if not requesting fate for the same user.
For single package requests, caller must be system uid or the
same package and hold interact_across_users if not requesting data
for the current user.
In both cases the caller must have the usagestats permission.
Test: couldn't find automated tests for this file; manual
Bug:
79142791
Change-Id: I8d650f8e875e0e4578cb48c9ba42e821342852a0
TreeHugger Robot [Wed, 6 Jun 2018 18:18:43 +0000 (18:18 +0000)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:18:35 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Selim Cinek [Wed, 6 Jun 2018 18:18:27 +0000 (18:18 +0000)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:13:55 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:13:27 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:04:41 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 17:51:32 +0000 (17:51 +0000)]
Merge "Light grey bugbot updates." into pi-dev
Mihai Popa [Wed, 6 Jun 2018 17:42:20 +0000 (10:42 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours am:
bb18c011aa -s ours
am:
7478894a89 -s ours
Change-Id: I22992503b6a99f7002d0ce440d4fda9e313bcf73
TreeHugger Robot [Wed, 6 Jun 2018 17:35:29 +0000 (17:35 +0000)]
Merge "Always return null when accessing provider unavailable to instant app"
TreeHugger Robot [Wed, 6 Jun 2018 17:33:25 +0000 (17:33 +0000)]
Merge "Update system server profile"
Rebecca Silberstein [Wed, 6 Jun 2018 17:16:21 +0000 (10:16 -0700)]
Merge "WifiManager: add call to see if apband conversion is required" into pi-dev am:
85bdd711ce
am:
b14e1fdbff
Change-Id: I8899a793ea7e6825d301d151de3713130390b14b
Julia Reynolds [Wed, 6 Jun 2018 17:11:14 +0000 (10:11 -0700)]
Merge "Use correct attribute name." into pi-dev am:
65a411ac45
am:
c28267da12
Change-Id: I303f870e96935819347cb416b1ecb7bc7d7d385b
Jean-Michel Trivi [Wed, 6 Jun 2018 17:03:00 +0000 (10:03 -0700)]
Merge "AudioRecord JNI: fix mem leak on audio_attributes_t" into pi-dev am:
2e73ff5e6f
am:
d65afab7ea
Change-Id: Iad6e749ec60ba6225634be3d4121c418c9ebfa55
Mihai Popa [Wed, 6 Jun 2018 17:01:16 +0000 (10:01 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours
am:
bb18c011aa -s ours
Change-Id: I2feb73ce9430daf5ead58675b552be326925af27
Rebecca Silberstein [Wed, 6 Jun 2018 16:51:50 +0000 (09:51 -0700)]
Merge "WifiManager: add call to see if apband conversion is required" into pi-dev
am:
85bdd711ce
Change-Id: I4f2c8e9ebcfd4bb92cad23f222218960188ca09b
TreeHugger Robot [Wed, 6 Jun 2018 16:50:30 +0000 (16:50 +0000)]
Merge "More string lint checks."
Julia Reynolds [Wed, 6 Jun 2018 16:46:23 +0000 (09:46 -0700)]
Merge "Use correct attribute name." into pi-dev
am:
65a411ac45
Change-Id: Ic2b5bcaa4637af3cb59c5b805e287a4c2ac6ee82
Jean-Michel Trivi [Wed, 6 Jun 2018 16:40:53 +0000 (09:40 -0700)]
Merge "AudioRecord JNI: fix mem leak on audio_attributes_t" into pi-dev
am:
2e73ff5e6f
Change-Id: I7290da47d3dd4efd56f986c7cc530bb10ec4e715
Rebecca Silberstein [Wed, 6 Jun 2018 16:36:37 +0000 (16:36 +0000)]
Merge "WifiManager: add call to see if apband conversion is required" into pi-dev
Mihai Popa [Wed, 6 Jun 2018 16:33:57 +0000 (09:33 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev
am:
3fce74a7f3 -s ours
Change-Id: I28ae4102fd8913d74e8dd928f286cbdbd66d0241
TreeHugger Robot [Wed, 6 Jun 2018 16:28:23 +0000 (16:28 +0000)]
Merge "Use correct attribute name." into pi-dev
Jean-Michel Trivi [Wed, 6 Jun 2018 16:25:09 +0000 (16:25 +0000)]
Merge "AudioRecord JNI: fix mem leak on audio_attributes_t" into pi-dev
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev
* changes:
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89 am:
f5d69aa775 skipped:
94bc67f03c
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89 am:
f5d69aa775
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c
Optimise the hit test algorithm
Nicolas Geoffray [Wed, 6 Jun 2018 16:08:37 +0000 (17:08 +0100)]
Light grey bugbot updates.
Bug:
109756637
Bug:
71814829
Test: m
Change-Id: Ic11a74a215315c71480cdd55ababdaab26f3577b
Neil Fuller [Wed, 6 Jun 2018 15:59:44 +0000 (15:59 +0000)]
Merge "Remove CommonClock / CommonTimeManagementService"
Calin Juravle [Wed, 6 Jun 2018 15:59:42 +0000 (08:59 -0700)]
Update system server profile
The previous profile contained only a few methods and classes
due to an error during processing.
Test: build & flash & boot
Change-Id: I4caac335941e2cc84c153652c5206fefdc03596b
Jeff Sharkey [Tue, 5 Jun 2018 21:55:45 +0000 (15:55 -0600)]
More string lint checks.
Expand strings into samples that are representative of what'll be
shown in UI, and warn if they're longer than defined CHAR LIMIT.
Guide all-caps strings towards android:textAllCaps if actions.
Warn when strings mention "phone" without defining product-specific
variants.
Bug:
76097999
Test: manual
Change-Id: I08046ecf531b2d616cb357639e804b73d6a12bea
Winson Chung [Wed, 6 Jun 2018 15:48:24 +0000 (08:48 -0700)]
Merge "Expose the source component which launched this task." into pi-dev am:
b4e4fc3a1e
am:
2e6f1a0475
Change-Id: I6b73ad07fc6090788149031ccd33c7077845bbdf
Calin Juravle [Wed, 6 Jun 2018 15:43:06 +0000 (08:43 -0700)]
Merge "Remove sun.nio.fs.UnixChannelFactory from preloaded-classes" into pi-dev am:
d8269005fe
am:
0101ed78cd
Change-Id: I17368728149729195179e04071133a2a50de311c
Evan Laird [Wed, 6 Jun 2018 15:34:55 +0000 (08:34 -0700)]
Merge "Consider icon scale when calculating icon offset in shelf" into pi-dev am:
00c132cd35
am:
47dbc38d5f
Change-Id: Ib89f65c44834d7e34342b6b8ef37f4b147466fc8
Winson Chung [Wed, 6 Jun 2018 15:33:51 +0000 (08:33 -0700)]
Merge "Expose the source component which launched this task." into pi-dev
am:
b4e4fc3a1e
Change-Id: Ia0282837d700e0820ca251b35a3a5b00179f8b0d
Calin Juravle [Wed, 6 Jun 2018 15:28:55 +0000 (08:28 -0700)]
Merge "Remove sun.nio.fs.UnixChannelFactory from preloaded-classes" into pi-dev
am:
d8269005fe
Change-Id: Ia82f41a25b85194c9badafda71cbe85715674ce5
Android Build Merger (Role) [Wed, 6 Jun 2018 15:28:23 +0000 (15:28 +0000)]
Merge "Merge "Wi-Fi, now corporeal!" into pi-dev am:
bc6f64d557 am:
52779174be"
Evan Laird [Wed, 6 Jun 2018 15:28:00 +0000 (08:28 -0700)]
Merge "Wi-Fi, now corporeal!" into pi-dev am:
bc6f64d557
am:
52779174be
Change-Id: I9779dc39c1bcd41c979141c8c8fac5e96701ae07
TreeHugger Robot [Wed, 6 Jun 2018 15:27:30 +0000 (15:27 +0000)]
Merge "Annotate Path with nullability annotations"
Svet Ganov [Wed, 6 Jun 2018 15:22:03 +0000 (08:22 -0700)]
Merge "Allow instant apps to send broadcasts to themselves" into pi-dev am:
93ec4f829d
am:
346d9f1a7e
Change-Id: I1dd924a6c9c183a26e008c8c7d291c1ce7ce0fac
Evan Laird [Wed, 6 Jun 2018 15:20:38 +0000 (08:20 -0700)]
Merge "Consider icon scale when calculating icon offset in shelf" into pi-dev
am:
00c132cd35
Change-Id: Id9fab2c7242fe202209580af74c3ba84eb5d7caa
Evan Laird [Wed, 6 Jun 2018 15:15:12 +0000 (08:15 -0700)]
Merge "Wi-Fi, now corporeal!" into pi-dev
am:
bc6f64d557
Change-Id: I97fc1ba28b14e59c01bb4561088883aaedb49e03
Winson Chung [Wed, 6 Jun 2018 15:13:27 +0000 (15:13 +0000)]
Merge "Expose the source component which launched this task." into pi-dev
Calin Juravle [Wed, 6 Jun 2018 15:09:17 +0000 (15:09 +0000)]
Merge "Remove sun.nio.fs.UnixChannelFactory from preloaded-classes" into pi-dev
Svet Ganov [Wed, 6 Jun 2018 15:04:40 +0000 (08:04 -0700)]
Merge "Allow instant apps to send broadcasts to themselves" into pi-dev
am:
93ec4f829d
Change-Id: Icdb0079006db75d16f48d6955e06edc0bb5c05c0
Clara Bayarri [Wed, 6 Jun 2018 15:04:04 +0000 (08:04 -0700)]
Merge "Fix repeated calls into reportExtractedText" into pi-dev am:
bcbdeb29c9
am:
1cf7c2e604
Change-Id: I467c01bbc66de8d5bf4ab9e6f97ecdc266b940ca
TreeHugger Robot [Wed, 6 Jun 2018 14:59:10 +0000 (14:59 +0000)]
Merge "Consider icon scale when calculating icon offset in shelf" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 14:54:35 +0000 (14:54 +0000)]
Merge "Wi-Fi, now corporeal!" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 14:51:33 +0000 (14:51 +0000)]
Merge "Allow instant apps to send broadcasts to themselves" into pi-dev
Clara Bayarri [Wed, 6 Jun 2018 14:48:50 +0000 (07:48 -0700)]
Merge "Fix repeated calls into reportExtractedText" into pi-dev
am:
bcbdeb29c9
Change-Id: Ifd8cf131d7884b77c597fd3d95ff67ccf9c9ff7a
TreeHugger Robot [Wed, 6 Jun 2018 14:40:12 +0000 (14:40 +0000)]
Merge "Fix repeated calls into reportExtractedText" into pi-dev
Lorenzo Colitti [Wed, 6 Jun 2018 14:15:56 +0000 (07:15 -0700)]
Merge "Support seamless handover between VPN fds." into pi-dev am:
f35fd8653c
am:
eacc81f7bb
Change-Id: I26a69940636e362a3ff5d76ba2eecc012faf39d0
Bill Yi [Wed, 6 Jun 2018 14:13:20 +0000 (07:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icbe0ecc8b5b4abbe01354757e74d622382c9c3b1
Julia Reynolds [Wed, 6 Jun 2018 14:07:19 +0000 (07:07 -0700)]
Merge "Further interruptiveness changes" into pi-dev am:
fe1d9dc1af
am:
bbaf6a4a6f
Change-Id: Ic6ac2a1ad921250fc751a643cd1b5ad58f8166e0
Lorenzo Colitti [Wed, 6 Jun 2018 14:05:13 +0000 (07:05 -0700)]
Merge "Support seamless handover between VPN fds." into pi-dev
am:
f35fd8653c
Change-Id: Ia94a34a1f4763d12b6d5ca702640933bc5c84499
Julia Reynolds [Wed, 6 Jun 2018 14:04:02 +0000 (10:04 -0400)]
Use correct attribute name.
Test: factory reset device and confirm default values
Change-Id: I96b20e98d740550fa1b47e069ebfb5fdf2368db2
Fixes:
109747051
Julia Reynolds [Wed, 6 Jun 2018 13:58:54 +0000 (06:58 -0700)]
Merge "Further interruptiveness changes" into pi-dev
am:
fe1d9dc1af
Change-Id: Ic258eaf306dc05850015808c9b67b07398575770
Jake Wharton [Tue, 5 Jun 2018 17:00:08 +0000 (13:00 -0400)]
Annotate Path with nullability annotations
Bug:
78245676
Test: none
Change-Id: Ibf906c35245cef35505f6286472a01f6a2751f1c
Jake Wharton [Wed, 6 Jun 2018 13:56:41 +0000 (13:56 +0000)]
Merge "Annotate Rect/RectF with nullability annotations"
TreeHugger Robot [Wed, 6 Jun 2018 13:51:23 +0000 (13:51 +0000)]
Merge "Support seamless handover between VPN fds." into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 13:46:42 +0000 (13:46 +0000)]
Merge "Further interruptiveness changes" into pi-dev
chaviw [Wed, 6 Jun 2018 13:19:59 +0000 (06:19 -0700)]
Merge "Notify WM that app is delayed closing due to the possibility of PIP." into pi-dev am:
47d9d9801b
am:
a514c9aa7c
Change-Id: I409440178472859660a3fbe6ffbb07998b0eb90e
Calin Juravle [Wed, 6 Jun 2018 13:13:39 +0000 (06:13 -0700)]
Remove sun.nio.fs.UnixChannelFactory from preloaded-classes
The tests use the preloaded classes to create the core image and
that leads to UnixChannelFactory being initialized despite the
fact that FileDescriptor is not. This manifests with a null pointer
crash in tests.
Bug:
80495283
Test: m test-art-host
Change-Id: I785104e6c69c605b16357a9557b203b489972261
chaviw [Wed, 6 Jun 2018 13:11:06 +0000 (06:11 -0700)]
Merge "Notify WM that app is delayed closing due to the possibility of PIP." into pi-dev
am:
47d9d9801b
Change-Id: I6b9e3426f35e66596e96068601e4166887586487
TreeHugger Robot [Wed, 6 Jun 2018 12:57:55 +0000 (12:57 +0000)]
Merge "Notify WM that app is delayed closing due to the possibility of PIP." into pi-dev
Bill Yi [Wed, 6 Jun 2018 12:14:39 +0000 (05:14 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I809062aaa6b66a40365e48d55c55a3adfb034102
Nicolas Geoffray [Wed, 6 Jun 2018 11:50:49 +0000 (04:50 -0700)]
Add 3 more APIs to light grey. am:
1bb35c2a21
am:
28476b0a28
Change-Id: I312b2333b2af692f36f34d9873928857ae849080
Nicolas Geoffray [Wed, 6 Jun 2018 11:44:19 +0000 (04:44 -0700)]
Add 3 more APIs to light grey.
am:
1bb35c2a21
Change-Id: Ibbadb5be4ffed11aa7135aa215a9263c9c1b6ca1
Bill Yi [Wed, 6 Jun 2018 10:51:03 +0000 (03:51 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7cf2593eace5002a2e71243589299609ad5fc5a3
Annie Meng [Wed, 6 Jun 2018 10:30:33 +0000 (10:30 +0000)]
Merge "Disable bmgr if BMS is not running"
Chalard Jean [Wed, 6 Jun 2018 10:18:28 +0000 (03:18 -0700)]
[automerger skipped] Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ... am:
b044b885cf am:
ac11946404 -s ours
am:
1ee97508f0 -s ours
Change-Id: Ic58754fa0a10f4242bcb6a80e69f7685048c6b3f
Chalard Jean [Wed, 6 Jun 2018 10:08:03 +0000 (03:08 -0700)]
[automerger skipped] Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ... am:
b044b885cf
am:
ac11946404 -s ours
Change-Id: I8c4838e96c77b58cbc7069c41c3c83a01b93ce7a
Bill Yi [Wed, 6 Jun 2018 10:06:03 +0000 (03:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If983b267ec120be4bf5d6e788209576f147c4ab5
Chalard Jean [Wed, 6 Jun 2018 10:00:49 +0000 (03:00 -0700)]
Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ...
am:
b044b885cf
Change-Id: Ib54b132dae9e6ab4e01ee46a8afdcb2f50df2709
TreeHugger Robot [Wed, 6 Jun 2018 09:46:22 +0000 (09:46 +0000)]
Merge "Remove adb shell bmgr restore <package>"
TreeHugger Robot [Wed, 6 Jun 2018 09:19:30 +0000 (09:19 +0000)]
Merge "Check manifest if runtime state of app is DEFAULT"
Bill Lin [Mon, 28 May 2018 12:55:36 +0000 (20:55 +0800)]
Fix TalkBack do not announce subTitle for NightDisplayTile
When focus on the specified Tile, all texts of the Tile should be announced.
(Refer CellularTile The SIM state of subTitle would be announced)
Test: atest SystemUITests
Bug:
80406584
Change-Id: I94a39d422f9e8e3f9339e43b0f6a63e83f3aefbd
Nan Zhang [Wed, 6 Jun 2018 08:34:47 +0000 (01:34 -0700)]
Merge "Add metalava based api-stubs modules in Android.bp" am:
f907578564 am:
25d4494793
am:
18543da456
Change-Id: I90124871fc88448c74439f9f4a8a66bda38a324a
Chalard Jean [Wed, 6 Jun 2018 08:25:45 +0000 (08:25 +0000)]
Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ...
* changes:
Let tests enumerate all transports/capabilities.
Destroy networks as soon as they are disconnected.
Fix a ConcurrentModificationException crash.
Unify behavior of various cases of "no underlying networks"
Fix: VPNs update caps upon underlying network disconnect.
Add tests for setUnderlyingNetworks.
Fix setCapabilities.
Fix SSID not being logged by the validation logs
Make sure getActiveNetwork is consistent with default callbacks
Add tests for getActiveNetwork.
Guard the SSID with NETWORK_SETTINGS
Add a new ssid field in NetworkCapabilities.
Notif manager and captive portal app to read SSID again
Remove unwanted capability from the java-doc
Actually @hide unwanted capability methods.
API council requested tweaks to NetworkRequest.
Add OEM_PAID capability to system api
add airplane mode shell commands to connectivity
Enable cleartext for captive portal apps
Expose CONNECTIVITY_ACTION to Instant Apps
fix isActiveNetworkMetered with VPNs
Jeff Sharkey [Mon, 14 May 2018 19:49:07 +0000 (13:49 -0600)]
Let tests enumerate all transports/capabilities.
This gives them a way to collect all included values without
resorting to manual probing of each newly added value.
Cherry-pick of ag/
4052941 with minor conflicts in the imports.
Bug:
16207332
Test: atest com.android.cts.net.HostsideVpnTests
Change-Id: Ia764b3412bf834890612378e0c3846913f4e0a06
Merged-In: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0
Merged-In: If07e77c92046807235229a4f67ee087bdd7bccf1
Chalard Jean [Fri, 11 May 2018 11:19:20 +0000 (20:19 +0900)]
Destroy networks as soon as they are disconnected.
...as opposed to after the async channel finished disconnecting.
Clean cherry-pick of ag/
4043255
Bug:
78308259
Test: runtest frameworks-net
also used a device with this patch over the weekend and
tried all I could think of
Merged-In: Ic4c7520e907de353a01c2a3a8a50d661dee4a994
Merged-In: I0617f0ff6e46a1d3764335a1e7ad01b34c8cc5a8
Change-Id: I4e4b41bbdf25d7d7bea4124cb58da004d47f1090
Bernardo Rufino [Wed, 30 May 2018 09:09:25 +0000 (10:09 +0100)]
Remove adb shell bmgr restore <package>
Also put comment on RestoreSession saying that it doesn't kill the app
in the end.
Bug:
29255593
Test: Builds
adb shell bmgr help, verify usage
adb shell bmgr restore android, verify no-op
Change-Id: I89304149ea6c03a80937e321cf3a46fd173308e2
Chalard Jean [Wed, 23 May 2018 00:07:51 +0000 (09:07 +0900)]
Fix a ConcurrentModificationException crash.
This is a pinpoint fix against the bug listed below. While a client
is synchronously reading the LinkProperties of a network, the
ConnectivityServiceThread is updating its properties. Make sure
that update is done atomically.
This is a stopgap countermeasure against a problem that is
pervasive with usage of LinkProperties, but fixing the problem
itself will happen later.
Clean cherry-pick of ag/
4174798
Bug:
80077223
Test: runtest frameworks-net
Change-Id: I61b262d824c98b4ced36395a597b73de9193a199
Merged-In: I25007ac26349e451bb47f966af70d590d699c347
Merged-In: I03526187645b6955eb89ca4d2e4a930ebac236b8
Chalard Jean [Mon, 21 May 2018 06:30:56 +0000 (15:30 +0900)]
Unify behavior of various cases of "no underlying networks"
Before this change, VPNs having no underlying networks would be
marked as metered as the safe option, but VPNs having only
disconnected underlying networks would be marked as unmetered.
Fix this discrepancy.
Clean cherry-pick of ag/
4113809
Bug:
79748782
Test: runtest frameworks-net
Change-Id: Ie6ace6bd95139605ffcfa8cd6c15cf28f8fa28c8
Merged-In: If19b85325e7d684e645470293b3c8a674084c641
Merged-in: I22f80a6a39d4a19ff74aa61fcbd66f1a041b1003