Ryan Lin
70d7f682c1
Merge "Add Bluetooth callback for device connection state changed" into pi-dev
...
am: 15aa546a37
2018-05-11 13:20:33 -07:00
Jason Monk
c71f4fea4b
Merge "Fix first-time slice permission grants" into pi-dev
...
am: 9959b36635
2018-05-11 12:56:43 -07:00
Ryan Lin
15aa546a37
Merge "Add Bluetooth callback for device connection state changed" into pi-dev
2018-05-11 19:53:19 +00:00
Robert Carr
3c65c76d56
Merge "Detach children in transaction." into pi-dev
...
am: 26aff0d907
2018-05-11 12:51:24 -07:00
Jason Monk
9959b36635
Merge "Fix first-time slice permission grants" into pi-dev
2018-05-11 19:40:10 +00:00
TreeHugger Robot
26aff0d907
Merge "Detach children in transaction." into pi-dev
2018-05-11 19:37:00 +00:00
Beverly
976f6ade83
Merge "Add charging metrics" into pi-dev
...
am: cf4f650572
2018-05-11 12:30:25 -07:00
Amith Yamasani
36424476bb
Merge "Add limits to App Usage Observer Api" into pi-dev
...
am: 98fd4fa0f4
2018-05-11 12:19:32 -07:00
TreeHugger Robot
cf4f650572
Merge "Add charging metrics" into pi-dev
2018-05-11 19:14:31 +00:00
Amith Yamasani
98fd4fa0f4
Merge "Add limits to App Usage Observer Api" into pi-dev
2018-05-11 19:03:11 +00:00
fionaxu
50b2c1ae6e
[automerger skipped] Merge "add install action for carrier id to system API" am: 87a7c657bd
...
am: 2bbb36cb4f
2018-05-11 12:01:25 -07:00
Abodunrinwa Toki
c2aa28895a
Merge "Fix TextClassifier logging." into pi-dev
...
am: 1c60953f9d
2018-05-11 11:54:47 -07:00
fionaxu
2bbb36cb4f
Merge "add install action for carrier id to system API"
...
am: 87a7c657bd
2018-05-11 11:52:27 -07:00
Chad Brubaker
5f51d45334
Merge "Fall back to checking packages if one is not provided" into pi-dev
...
am: 9d976db861
2018-05-11 11:35:58 -07:00
TreeHugger Robot
1c60953f9d
Merge "Fix TextClassifier logging." into pi-dev
2018-05-11 18:29:31 +00:00
Michael Dooley
ce408cbce7
Merge "Don't crash if SoundTriggerDetectionService client is gone or if there is a remote exception while finishing an opperation" into pi-dev
...
am: 74b6863504
2018-05-11 11:29:19 -07:00
Todd Kennedy
f08b40642a
Merge changes from topic "b_78809704" into pi-dev
...
am: 92b64bb1bb
2018-05-11 11:15:10 -07:00
Chad Brubaker
9d976db861
Merge "Fall back to checking packages if one is not provided" into pi-dev
2018-05-11 18:13:35 +00:00
Mrten Kongstad
0ddacd34de
OMS: rebase settings when overlays update
...
am: 2f1944bf0e
2018-05-11 11:09:25 -07:00
Bryce Lee
356759d659
Merge "Don't allow non-showOnLock activity to be next on finish." into pi-dev
...
am: 92a339736f
2018-05-11 11:03:50 -07:00
Dieter Hsu
62a0d4f32e
Merge "Fix active permission touch target too small" into pi-dev
...
am: bb668a2bb7
2018-05-11 10:57:49 -07:00
Michael Dooley
74b6863504
Merge "Don't crash if SoundTriggerDetectionService client is gone or if there is a remote exception while finishing an opperation" into pi-dev
2018-05-11 17:46:41 +00:00
Lucas Dupin
24ef8f99ab
Merge "Do not hide keyguard message when fp" into pi-dev
...
am: 2d2d79b92c
2018-05-11 10:46:21 -07:00
Todd Kennedy
92b64bb1bb
Merge changes from topic "b_78809704" into pi-dev
...
* changes:
OMS: teach the OMS about static RROs
OMS: rebase settings when overlays update
2018-05-11 17:44:53 +00:00
TreeHugger Robot
92a339736f
Merge "Don't allow non-showOnLock activity to be next on finish." into pi-dev
2018-05-11 17:39:36 +00:00
Jason Monk
16db9b96bf
Merge "Allow onGetSliceDescendants to be slow" into pi-dev
...
am: 02b9592ff1
2018-05-11 10:37:59 -07:00
Dieter Hsu
bb668a2bb7
Merge "Fix active permission touch target too small" into pi-dev
2018-05-11 17:37:35 +00:00
Treehugger Robot
87a7c657bd
Merge "add install action for carrier id to system API"
2018-05-11 17:36:24 +00:00
Patrick Baumann
8bbf6a4eab
Merge "Support generic filters when EXTERNAL flag is set" into pi-dev
...
am: 78f939b40f
2018-05-11 10:33:20 -07:00
TreeHugger Robot
2d2d79b92c
Merge "Do not hide keyguard message when fp" into pi-dev
2018-05-11 17:31:24 +00:00
Jordan Liu
e9a3356c31
[automerger skipped] Merge "Add Carriers.APN_SET_ID and NO_SET_SET" am: cdb29f97db
...
am: 87a0844d12
2018-05-11 10:29:53 -07:00
TreeHugger Robot
02b9592ff1
Merge "Allow onGetSliceDescendants to be slow" into pi-dev
2018-05-11 17:21:28 +00:00
TreeHugger Robot
78f939b40f
Merge "Support generic filters when EXTERNAL flag is set" into pi-dev
2018-05-11 17:16:37 +00:00
Chad Brubaker
0de6a7f521
Fall back to checking packages if one is not provided
...
Test: atest GsmCdmaPhoneTest.java
Change-Id: I81df49fd2f751ce28d834fc5d9cd254623930770
Fixes: 75450505
2018-05-11 10:07:33 -07:00
Jordan Liu
87a0844d12
Merge "Add Carriers.APN_SET_ID and NO_SET_SET"
...
am: cdb29f97db
2018-05-11 10:04:19 -07:00
Bo Zhu
542dbb9734
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev
...
am: 90dbb0ed72
2018-05-11 09:59:59 -07:00
Beverly
c4eb934499
Add charging metrics
...
Change-Id: Icef477c99cb9e53faff852cf6003f912ab8b10c3
Fixes: 78463707
Test: manual
2018-05-11 12:59:00 -04:00
Riddle Hsu
fb9bfe3fdc
Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev
...
am: eacc2163d3
2018-05-11 09:50:20 -07:00
Bo Zhu
90dbb0ed72
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev
2018-05-11 16:46:16 +00:00
Riddle Hsu
eacc2163d3
Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev
2018-05-11 16:36:29 +00:00
Jason Monk
9c03ef48b6
Fix first-time slice permission grants
...
Test: Added a test
Change-Id: Ib4c0b65c6fec6fcb97bccb2f3d35f5c35ede3786
Fixes: 79567935
2018-05-11 09:26:51 -07:00
Lucas Dupin
29e796d26a
Do not hide keyguard message when fp
...
Test: atest packages/SystemUI/tests/src/com/android/keyguard/KeyguardPinBasedInputViewTest.java
Change-Id: I5d76b688b0eb7c1df6a36c1cb910f2b0ec98bc46
Fixes: 78235570
2018-05-11 09:22:39 -07:00
Patrick Baumann
a6862c2380
Support generic filters when EXTERNAL flag is set
...
This change opts instant app resolution out of hash prefix matching if
the intent filter being tested does not define an authority only when
the MATCH_EXTERNAL flag is set. This allows for a class of instant apps
that generically handle certain mime types or actions, but aren't tied
to a particular authority / domain.
This also moves the null check for resolution to a higher level,
accounting for connection-related failures to ensure that the installer
always gets a properly formatted intent.
Bug: 63117034
Test: manual - force connection timeouts and observe correct install intent
Test: manual - launch a generic type handler for a made up mime type;
observe correct resolution
Test: atest EphemeralTest
Change-Id: I0101e3219f543897a488ddd3d7c4c884f7d6cac3
2018-05-11 16:06:52 +00:00
Mathew Inwood
2b46441438
Merge "Add APIs from public requests." into pi-dev
...
am: 7692904a7b
2018-05-11 08:58:18 -07:00
Jordan Liu
cdb29f97db
Merge "Add Carriers.APN_SET_ID and NO_SET_SET"
2018-05-11 15:57:16 +00:00
fionaxu
4ff8de609b
add install action for carrier id to system API
...
Bug: 79426800
Test: Manual
Change-Id: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
(cherry picked from commit 2776ed56b8
2018-05-11 15:54:45 +00:00
Mathew Inwood
7692904a7b
Merge "Add APIs from public requests." into pi-dev
2018-05-11 15:44:53 +00:00
Ryan Mitchell
78e0e6aa2e
Merge "AAPT2: Insert platformBuild information" into pi-dev
...
am: 91d2f87d0e
2018-05-11 08:30:35 -07:00
David Brazdil
bad3bf6c22
Merge "Include in hidden API dark greylist based on package name" into pi-dev
...
am: f36144f575
2018-05-11 08:24:12 -07:00
Jason Monk
a66dfee8d0
Allow onGetSliceDescendants to be slow
...
Because sometimes it needs to be
Test: existing tests
Bug: 79132845
Bug: 77873463
Change-Id: I93aa8553c48c856bf96c347a229be6e770751708
2018-05-11 08:23:59 -07:00
