Luke Huang
e0a0963542
Merge "Support enable/disable dns forwarding of dnsmasq when start tethering" am: 6fecb94292 am: a3ddee80fd am: f03f803aaf am: f9b00a4427
...
am: d838e6d186
Change-Id: Ie9850a614ab191a709e98795f8e9301db1321108
2019-08-28 06:54:02 -07:00
Luke Huang
d838e6d186
Merge "Support enable/disable dns forwarding of dnsmasq when start tethering" am: 6fecb94292 am: a3ddee80fd am: f03f803aaf
...
am: f9b00a4427
Change-Id: I85c715b4fe213d83e4d31140b0e39bed426226d0
2019-08-28 06:42:34 -07:00
Luke Huang
f9b00a4427
Merge "Support enable/disable dns forwarding of dnsmasq when start tethering" am: 6fecb94292 am: a3ddee80fd
...
am: f03f803aaf
Change-Id: I1336a04e1a7b1655354f4d3d4b93897e2db4fdbe
2019-08-28 06:30:42 -07:00
Luke Huang
f03f803aaf
Merge "Support enable/disable dns forwarding of dnsmasq when start tethering" am: 6fecb94292
...
am: a3ddee80fd
Change-Id: If5a280508dcc95df911d1d72671857a8c58bbbd4
2019-08-28 06:18:40 -07:00
Luke Huang
a3ddee80fd
Merge "Support enable/disable dns forwarding of dnsmasq when start tethering"
...
am: 6fecb94292
Change-Id: I8f5c67fa1e045c9fd4a5e7a753df285d1111c1d2
2019-08-28 06:06:44 -07:00
Luke Huang
6fecb94292
Merge "Support enable/disable dns forwarding of dnsmasq when start tethering"
2019-08-28 12:53:16 +00:00
TreeHugger Robot
47114169b7
Merge "Add RoleControllerManager.isApplicationVisibleForRole()."
2019-08-28 11:19:50 +00:00
Tony Mak
33e979cc99
Merge "Add TYPE_LINKS_GENERATED and make ... TextClassificationSessionId.flattenToString() public"
2019-08-28 11:03:48 +00:00
Mark Chien
9fc4fe0c49
Merge "Passing caller package name to setBluetoothTethering" am: 751f034b82 am: b2d0c6357c am: 8e3ad12386 am: f1575b130f
...
am: ba6777cd23
Change-Id: Iafdb94f1dda8e2f2544d927d494b482ad3b366e5
2019-08-28 03:41:54 -07:00
Mark Chien
ba6777cd23
Merge "Passing caller package name to setBluetoothTethering" am: 751f034b82 am: b2d0c6357c am: 8e3ad12386
...
am: f1575b130f
Change-Id: I5df2aea7161a4261fa98ef7ed8567ff2ef0d0692
2019-08-28 03:31:20 -07:00
Mark Chien
f1575b130f
Merge "Passing caller package name to setBluetoothTethering" am: 751f034b82 am: b2d0c6357c
...
am: 8e3ad12386
Change-Id: I5f158ae800ee0df5ee44d41a19a37ab90b39fc6b
2019-08-28 03:24:39 -07:00
Mark Chien
8e3ad12386
Merge "Passing caller package name to setBluetoothTethering" am: 751f034b82
...
am: b2d0c6357c
Change-Id: If3f6b8a5c7db9add48d1a871b933441b486ef6b7
2019-08-28 03:18:43 -07:00
Mark Chien
b2d0c6357c
Merge "Passing caller package name to setBluetoothTethering"
...
am: 751f034b82
Change-Id: I7f6b22e4b8273cbdb3b40a7dd926e838d6fa7455
2019-08-28 03:12:54 -07:00
Mark Chien
751f034b82
Merge "Passing caller package name to setBluetoothTethering"
2019-08-28 09:59:27 +00:00
Oli Lan
df720dc785
Merge "Wait for available rollbacks in RollbackTest."
2019-08-28 09:24:29 +00:00
Neil Fuller
b75c38dbe9
Merge "Fix bug in Time.getJulianDay()"
2019-08-28 08:19:13 +00:00
Shimi Zhang
cc7628964c
Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b am: d081f1064d am: 0922cc17be
...
am: 3446691be1
Change-Id: I8d7b836d8582fd63cc5bedfa4c7961f2c6603672
2019-08-27 19:56:22 -07:00
Shimi Zhang
3446691be1
Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b am: d081f1064d
...
am: 0922cc17be
Change-Id: I651134edf0940a5425c5a613dc2308b21fd76892
2019-08-27 19:19:45 -07:00
Ryan Lin
2dae26c474
Merge "Make jdoc explicit for a11y window API in multi-display case"
2019-08-28 02:17:34 +00:00
RyanlwLin
ed124d0f41
Make jdoc explicit for a11y window API in multi-display case
...
bug: 133597330
Test: NA
Change-Id: Ia553b48931743452b4e40820f58cfcfab1b23bf3
2019-08-28 02:17:10 +00:00
Shimi Zhang
0922cc17be
Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b
...
am: d081f1064d
Change-Id: I2c02ba4da3494dfda62f13e5891a9a24e474abc7
2019-08-27 19:11:46 -07:00
Shimi Zhang
d081f1064d
Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev
...
am: 62c764e29b
Change-Id: Idaa6942a802f446e664ec3e2c6078258d9d2f8cc
2019-08-27 18:58:42 -07:00
TreeHugger Robot
62c764e29b
Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev
2019-08-28 01:39:59 +00:00
Winson Chung
e4d98cd157
Merge "Ignore hidden views when computing exclusion rects" into qt-qpr1-dev am: b5b3a58173
...
am: 6ff8b5d1fe
Change-Id: I30cfe658327833232871dcd0a3bb895d5453026f
2019-08-27 16:04:24 -07:00
Winson Chung
6ff8b5d1fe
Merge "Ignore hidden views when computing exclusion rects" into qt-qpr1-dev
...
am: b5b3a58173
Change-Id: Ibd8f15a0fbb380efa8989a09ecdcf1baa66fb201
2019-08-27 15:38:28 -07:00
TreeHugger Robot
b5b3a58173
Merge "Ignore hidden views when computing exclusion rects" into qt-qpr1-dev
2019-08-27 21:54:09 +00:00
Taran Singh
d332901cde
Merge "IME transitions without pre-rendering."
2019-08-27 20:57:59 +00:00
Lucas Dupin
153d424cb6
Merge "IPC StrictMode"
2019-08-27 19:49:28 +00:00
TreeHugger Robot
37ec9aa590
Merge "Give the legacy camera looper thread a name."
2019-08-27 19:11:31 +00:00
Akinobu Nakashima
cba3662cf2
Merge "Fix backward compatibility when there's no secureElementName" am: 24ae670b4e am: f18917783c am: 53f9a60d8f am: 80d1a65288
...
am: b0c17a68c8
Change-Id: I89d010605e113046d22dfba1df9dfce397f533ef
2019-08-27 10:51:09 -07:00
Akinobu Nakashima
b0c17a68c8
Merge "Fix backward compatibility when there's no secureElementName" am: 24ae670b4e am: f18917783c am: 53f9a60d8f
...
am: 80d1a65288
Change-Id: I33ebb180831878166645520f95864972b17191c2
2019-08-27 10:38:49 -07:00
Akinobu Nakashima
80d1a65288
Merge "Fix backward compatibility when there's no secureElementName" am: 24ae670b4e am: f18917783c
...
am: 53f9a60d8f
Change-Id: I5864d6e77e3d33a3c60902605d79dff765c6b8c4
2019-08-27 10:26:55 -07:00
Akinobu Nakashima
53f9a60d8f
Merge "Fix backward compatibility when there's no secureElementName" am: 24ae670b4e
...
am: f18917783c
Change-Id: I1f182bf2655e2ece7a28a9cdef4aa98339ab41b6
2019-08-27 10:12:49 -07:00
Akinobu Nakashima
f18917783c
Merge "Fix backward compatibility when there's no secureElementName"
...
am: 24ae670b4e
Change-Id: I963ccde31ca834bf4fec47e4dca05dcce1d1c4e2
2019-08-27 09:57:56 -07:00
Varun Shah
3bade98359
Merge "Update mTransport check before trying to configure."
2019-08-27 16:55:06 +00:00
Treehugger Robot
24ae670b4e
Merge "Fix backward compatibility when there's no secureElementName"
2019-08-27 16:30:15 +00:00
Oli Lan
0a3c06e9c9
Wait for available rollbacks in RollbackTest.
...
This changes RollbackTest to retry checks for available rollbacks for
a certain period of time, using a new RollbackUtils method
waitForAvailableRollbacks.
Currently many of the tests in RollbackTest are flaky due to race conditions
between checking for available rollbacks and the installer onFinished callback.
This CL should fix all of those issues.
The previous attempt to resolve this by adding NewRollbacks speculatively to
the results of getAvailableRollbacks was not successful. This CL reverts that
change so that getAvailableRollbacks once again only returns rollbacks that are
actually available.
Bug: 136548146
Test: atest RollbackTest run on cuttlefish on acloud repeatedly
Change-Id: I27e2513b34f49af2f41cd627a5d2550541831e11
2019-08-27 17:04:25 +01:00
markchien
560c3ac1dc
Passing caller package name to setBluetoothTethering
...
This is necessary to examine caller's permission. If caller's uid is not
same as passing package name, SecurityException would be throwed.
This change also clear the identity before calling
BluetoothPan#setBluetoothTethering() in Tethering#setBluetoothTethering.
This is fine because caller already pass permission check before in
ConnectivityService. See the flow below:
ConnectivityManager#startTethering -> ConnectivityService#startTethering
-> Tethering#startTethering -> Tethering#setBluetoothTethering
-> BluetoothPan#setBluetoothTethering
Bug: 134649258
Test: -build, flash, boot
-atest FrameworkNetTests
-manual test with bluetooth OFF/ON
Change-Id: I2140398ad3bbc8076f729c843f0515c654553aaf
2019-08-27 23:26:20 +08:00
Tony Mak
a2ffa37d38
Add TYPE_LINKS_GENERATED and make ...
...
TextClassificationSessionId.flattenToString() public
TextClassificationSessionId.flattenToString() is public, so that
text classifiers can log the session ID as a string.
Also, fix toString() method in TextClassifierEvent.
Bug: 124437773
Test: Added CTS for flattenToString().
Test: Checked toString output.
Change-Id: If615703a0bdb3762b05da504b3883f85daf17afe
2019-08-27 15:23:08 +00:00
TreeHugger Robot
f468327f9f
Merge "Deprecated APIs related to ActivityGroup"
2019-08-27 13:53:38 +00:00
Lorenzo Colitti
d50b505965
Merge changes I69cdbb16,I6975e0b7 am: d889cb5098 am: ac913d725f am: 93d68de285 am: bb0edef6e8
...
am: 7ea7b0b1f1
Change-Id: Ie87981017bf2d4deef2092407c31fb3df4464dc8
2019-08-27 04:24:55 -07:00
Lorenzo Colitti
7ea7b0b1f1
Merge changes I69cdbb16,I6975e0b7 am: d889cb5098 am: ac913d725f am: 93d68de285
...
am: bb0edef6e8
Change-Id: I77ca7b17bea79dee5156839d1164b0fc78b31fe5
2019-08-27 04:12:45 -07:00
Lorenzo Colitti
bb0edef6e8
Merge changes I69cdbb16,I6975e0b7 am: d889cb5098 am: ac913d725f
...
am: 93d68de285
Change-Id: Id2ef4273b32f804f2a5b935fe9a9d59424baa85a
2019-08-27 03:58:57 -07:00
Lorenzo Colitti
93d68de285
Merge changes I69cdbb16,I6975e0b7 am: d889cb5098
...
am: ac913d725f
Change-Id: I6f6458883392a396ff831c6ddd74295e00daae0f
2019-08-27 03:44:40 -07:00
Lorenzo Colitti
ac913d725f
Merge changes I69cdbb16,I6975e0b7
...
am: d889cb5098
Change-Id: I3c8ddf7809a0d443587c1c4c06ef56ac302fc80f
2019-08-27 03:31:02 -07:00
Lorenzo Colitti
d889cb5098
Merge changes I69cdbb16,I6975e0b7
...
* changes:
notify netd about uid internet permission changes when package replaced
Backport PackageListObserver#onPackageChanged.
2019-08-27 10:17:42 +00:00
Kevin Hufnagle
db1bad4ab9
Merge "docs: Added content desc in ImageView example." into qt-dev am: eba5156095
...
am: 230a23e8d2
Change-Id: Ibf9c2193db824ffd49022d9139b520a6d0986c52
2019-08-27 02:13:09 -07:00
Charles Chen
c380f0279c
Deprecated APIs related to ActivityGroup
...
Since ActivityGroup logic has been deprecated, it does not make sense to
maintain related APIs in Activity. Deprecate them and make developers
to use fragment APIs or APIs without fromChild suffix version.
Bug: 137825207
Test: build, flash and presubmit
Change-Id: Ia0b6e78079efd4734cacc52bf2c708f628ef323b
2019-08-27 16:43:02 +08:00
Long Ling
119ed4506e
Merge changes from topic "device_config_for_display_qpr1" into qt-qpr1-dev am: 30e9250f19
...
am: 7adf3f0109
Change-Id: Ia17a834fa382f31ca30a8df50063554dea0859b0
2019-08-26 23:16:39 -07:00
Long Ling
7adf3f0109
Merge changes from topic "device_config_for_display_qpr1" into qt-qpr1-dev
...
am: 30e9250f19
Change-Id: I6db03bb92b73c799944764014acb31ebc3038165
2019-08-26 21:59:12 -07:00