Ben Lin
2db7e4d384
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev am: d6bfaba59c
...
am: bb87997182
Change-Id: I82a9b7c4542e4a2f157a608be3a991c158707f12
2017-05-03 02:37:27 +00:00
Ben Lin
bb87997182
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
...
am: d6bfaba59c
Change-Id: I807eaa3090e655fdc959a10fe2652c2f4d932b01
2017-05-03 02:30:29 +00:00
Daichi Hirono
919d2c1a98
Merge "Don't add other's child as header or footer" into oc-dev am: 9e37a2e419
...
am: 9227334834
Change-Id: I07df9ddb7136e7018b0be1d2dfaa1c7f589e0df2
2017-05-03 02:27:56 +00:00
Ben Lin
d6bfaba59c
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
2017-05-03 02:25:08 +00:00
Todd Kennedy
2b33116477
Merge "Optionally let the instant app into disambig" into oc-dev am: 1f1d60c5a1
...
am: 74e39de950
Change-Id: I4e48ba4c05d764322ad2e953430b8b02c7c09712
2017-05-03 02:23:03 +00:00
Daichi Hirono
9227334834
Merge "Don't add other's child as header or footer" into oc-dev
...
am: 9e37a2e419
Change-Id: I7377848132c5334f0becc640ea82255ff41dee7c
2017-05-03 02:18:52 +00:00
Todd Kennedy
74e39de950
Merge "Optionally let the instant app into disambig" into oc-dev
...
am: 1f1d60c5a1
Change-Id: I78725fadab5bb7222f9d4528d21b22d881df45a1
2017-05-03 02:12:28 +00:00
TreeHugger Robot
9e37a2e419
Merge "Don't add other's child as header or footer" into oc-dev
2017-05-03 02:12:08 +00:00
Makoto Onuki
d10ca46df3
Merge "Add more information to WTF to investigate bug 37809561" into oc-dev am: e497b698d2
...
am: bab47edecb
Change-Id: Ie781c121fbf3b71e3189cf1a84257116afd963a8
2017-05-03 00:06:30 +00:00
Todd Kennedy
72dc2fa6ad
Optionally let the instant app into disambig
...
When a user clicks "view on web", it's not assumed this is meant to be
forever. In this case, we will adjust the instant app's verification
status so that the instant isn't automatically run.
Change-Id: I246de901dafb23159a064d205fdb614d657a99dc
Fixes: 37686922
Test: Manual
Test: 1) Install instant app
Test: 2) Set to always-ask -- adb shell pm set-app-link package.name always-ask
Test: 3) Notice that we get a disambig w/ the instant app and chrome as options
Test: 4) Set to never -- adb shell pm set-app-link package.name never
Test: 5) Notice that we don't get the instant app
2017-05-02 17:03:36 -07:00
Makoto Onuki
bab47edecb
Merge "Add more information to WTF to investigate bug 37809561" into oc-dev
...
am: e497b698d2
Change-Id: I0d5ace9d9b302e8f924d096fb245a81a3dfa8568
2017-05-02 23:57:45 +00:00
TreeHugger Robot
e497b698d2
Merge "Add more information to WTF to investigate bug 37809561" into oc-dev
2017-05-02 23:51:37 +00:00
Winson Chung
4678eca685
Merge "Restoring old methods for compatibility." into oc-dev am: d6c190c8d2
...
am: 3d66fb6519
Change-Id: I1066d1efed081776286ef8ded7933998a89e1dd8
2017-05-02 23:34:46 +00:00
Winson Chung
3d66fb6519
Merge "Restoring old methods for compatibility." into oc-dev
...
am: d6c190c8d2
Change-Id: I306a8520873eb76182f3b04617265f5bf662aaf8
2017-05-02 23:27:48 +00:00
Winson Chung
d6c190c8d2
Merge "Restoring old methods for compatibility." into oc-dev
2017-05-02 23:19:29 +00:00
TreeHugger Robot
4b64614e6e
Merge "Upstream update"
2017-05-02 22:47:05 +00:00
Michael Wright
c48451933d
Merge "O is API 26" into oc-dev am: 074a67c116
...
am: 8433705f77
Change-Id: I8e394ffd699c115b316f3b6d2430ae75325d4047
2017-05-02 22:26:41 +00:00
Michael Dooley
ea1bc75d98
Merge "Adding voicemail transcription state to the database" into oc-dev am: 4794cbf574
...
am: bc06988d8b
Change-Id: Ie25fb987b0013625b697098ea518ccc4b40f8999
2017-05-02 22:20:45 +00:00
Winson Chung
ca754789c1
Restoring old methods for compatibility.
...
Bug: 37637423
Test: Build and test PIP apps
Change-Id: I9ccb49a3e42de55a249ab54bde2f3c5a1c179c1c
2017-05-02 15:18:23 -07:00
Michael Wright
8433705f77
Merge "O is API 26" into oc-dev
...
am: 074a67c116
Change-Id: Ie1d9b8ebb3b1c1693bbce5bf7f7d1f8c7159e54e
2017-05-02 22:17:25 +00:00
TreeHugger Robot
074a67c116
Merge "O is API 26" into oc-dev
2017-05-02 22:11:58 +00:00
Michael Dooley
bc06988d8b
Merge "Adding voicemail transcription state to the database" into oc-dev
...
am: 4794cbf574
Change-Id: I121f40cb64c546b0f6e140943d5a263ee05b05b4
2017-05-02 22:08:43 +00:00
Michael Dooley
4794cbf574
Merge "Adding voicemail transcription state to the database" into oc-dev
2017-05-02 22:01:18 +00:00
Evan Rosky
df10a77589
Merge "Don't focus search user-specified views which are invisible" into oc-dev am: 3b213ed438
...
am: 078728f100
Change-Id: I313b35f2f20ed4e0a0af5c45ba95816a2ed7d083
2017-05-02 21:18:23 +00:00
Evan Rosky
078728f100
Merge "Don't focus search user-specified views which are invisible" into oc-dev
...
am: 3b213ed438
Change-Id: I5a058c7024020e41ba8747c243d7209127cba19f
2017-05-02 21:01:30 +00:00
Evan Rosky
3b213ed438
Merge "Don't focus search user-specified views which are invisible" into oc-dev
2017-05-02 20:54:12 +00:00
Ben Lin
dac516ef32
Remove snippet regarding ContentProvider#notifyChange in documentation.
...
For ContentProvider and DocumentsProvider, throwing an exception in
their query methods will result in no Cursor returned to the remote
side. Without a cursor, there is no way to listen in on changes.
Removing the part regarding notifyChange since there's no established
paradigm on which URI to listen/notify changes on.
Test: Documentation change only.
Bug: 37876119
Change-Id: I0739794a1e8182918758ba953251ed9a3268f227
2017-05-02 13:35:13 -07:00
Abodunrinwa Toki
c6d132c11d
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev am: 3cb61255ab
...
am: 0ed16d0d42
Change-Id: I8ccf6ff7f16cc94e9213442383e8eb9c58b5d18d
2017-05-02 20:24:08 +00:00
Abodunrinwa Toki
0ed16d0d42
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
...
am: 3cb61255ab
Change-Id: Ie089ed63df8064798fa98a8a2378b81d09cf3b1c
2017-05-02 20:17:18 +00:00
TreeHugger Robot
3cb61255ab
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
2017-05-02 20:05:48 +00:00
Calin Juravle
8a532cf257
Merge "Make PM#registerDexModule oneway"
2017-05-02 19:55:23 +00:00
Calin Juravle
d478aaedc0
Merge "Make PM#notifyDexLoad oneway" into oc-dev am: 5f016f6705
...
am: 711016dfbc
Change-Id: Ifde71f3cfaa3a1053f3f19f3b722620111e7e0f5
2017-05-02 19:16:24 +00:00
Calin Juravle
711016dfbc
Merge "Make PM#notifyDexLoad oneway" into oc-dev
...
am: 5f016f6705
Change-Id: Ica5f01a3c66c71104ff0e3b26e9e5fdf7802bc60
2017-05-02 19:10:17 +00:00
Abodunrinwa Toki
021119d5a2
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev am: b950ac6b0f
...
am: 2deb2fab29
Change-Id: I7cf2ecfb78c64f626371dedab5394d0079c8cadc
2017-05-02 19:07:30 +00:00
Calin Juravle
5f016f6705
Merge "Make PM#notifyDexLoad oneway" into oc-dev
2017-05-02 19:03:22 +00:00
Makoto Onuki
f3bb6f31f4
Add more information to WTF to investigate bug 37809561
...
Bug 37809561
Test: Build & boot -- didn't actually exercise the WTF case but it should work
since getStackTraceString accepts null too.
Change-Id: Iabfbe1fcde293fec919c65df7ea9650e1b247b9a
2017-05-02 12:02:23 -07:00
Abodunrinwa Toki
2deb2fab29
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev
...
am: b950ac6b0f
Change-Id: I9ec0463e9641fb6a54e26311273932d3d1a6d41e
2017-05-02 19:00:53 +00:00
TreeHugger Robot
b950ac6b0f
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev
2017-05-02 18:55:06 +00:00
Michael Wright
9bcef8e2da
O is API 26
...
Bug: 37480230
Test: build, boot
Change-Id: Idfa91e1e094606f92c4141beb8569c241c639ee1
2017-05-02 19:23:12 +01:00
Seigo Nonaka
4fab38f1be
Merge "Fix NPE happens if no source was specified to font element." into oc-dev am: b3e92234fa
...
am: 159f549c8f
Change-Id: Ief83bf6522468ab40d8dd9c3a68ab72892952ea4
2017-05-02 17:44:46 +00:00
Abodunrinwa Toki
8dd3a744a6
Support resetting "smart selection" to any word in the selection.
...
Test: See topic
Bug: 34779207
Change-Id: I75a9b991571f750b362047baa13675250e929223
2017-05-02 18:44:19 +01:00
Lucas Dupin
425d9c5ae6
Upstream update
...
Pulling changes from support library
Test: non-applicable
Change-Id: Ibacca48ad78a39739793b6400b7fcb19447d26db
2017-05-02 10:33:00 -07:00
Seigo Nonaka
159f549c8f
Merge "Fix NPE happens if no source was specified to font element." into oc-dev
...
am: b3e92234fa
Change-Id: If06bf0e49030839f1b4f95c0a776e4aab1ed94d8
2017-05-02 17:32:04 +00:00
TreeHugger Robot
b3e92234fa
Merge "Fix NPE happens if no source was specified to font element." into oc-dev
2017-05-02 17:23:03 +00:00
Abodunrinwa Toki
6ace893026
Close file descriptor after SmartSelection is initialized.
...
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 37446398
Change-Id: I6f6d927f447d3cc1dffaee2406ff240d0600eb19
2017-05-02 17:17:26 +00:00
Abodunrinwa Toki
4e2f0c8656
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev am: 0fe5a2d5b3
...
am: 1b048b299c
Change-Id: I1793a8ab5bf98bf4e0c558df38238fbbfc6560c9
2017-05-02 16:40:12 +00:00
Abodunrinwa Toki
1b048b299c
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
...
am: 0fe5a2d5b3
Change-Id: I72d5fdd4351860bc02289abde6b1c36e13407e69
2017-05-02 16:31:50 +00:00
TreeHugger Robot
0fe5a2d5b3
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
2017-05-02 16:21:14 +00:00
Vladislav Kaznacheev
8386225861
Merge "Fix submenu position when showing with Gravity.END" into oc-dev am: 883af0766a
...
am: 1ae2909045
Change-Id: I178f0af13e2df05acf0918e492a9b8a44d1107e6
2017-05-02 15:58:35 +00:00
Tony Mak
60d88ea3dd
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev am: 91c6e44e9e
...
am: 1fe0c5cae8
Change-Id: I2fb7103267fbcf76ede3f168b4d7b4892c501943
2017-05-02 15:55:21 +00:00