Commit Graph

19806 Commits

Author SHA1 Message Date
Antoan Angelov
007406ee3d Merge "Move the support_transfer_ownership_metadata inside the device admin descriptor XML." into pi-dev am: 675db3f236
am: 47d73e3ac1

Change-Id: I8a01541ae5699ecbe629dba55e0828c1e83dfa51
2018-03-15 20:21:59 +00:00
Antoan Angelov
675db3f236 Merge "Move the support_transfer_ownership_metadata inside the device admin descriptor XML." into pi-dev 2018-03-15 19:40:13 +00:00
Yohei Yukawa
db4263420d Merge "Add IMS#BACK_DISPOSITION_ADJUST_NOTHING" into pi-dev am: feff6c7d41
am: 137ae697c3

Change-Id: I9ed3f40624fc9c45f289367c2370c5f21b8fc8d1
2018-03-15 13:55:56 +00:00
TreeHugger Robot
feff6c7d41 Merge "Add IMS#BACK_DISPOSITION_ADJUST_NOTHING" into pi-dev 2018-03-15 13:27:30 +00:00
Adora Zhang
414250d658 Merge "Add notification category: CATEGORY_NAVIGATION; Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION." into pi-dev am: 5d9617c439
am: d8a94c6ae4

Change-Id: I86b7d0c8e72c7b9dcae683c78203931264602171
2018-03-15 04:59:00 +00:00
Roshan Pius
ca121bff82 Merge "WifiConfiguration: Undeprecate WPA_PSK" into pi-dev am: dbeb6bc3f1
am: 1bbb9974b3

Change-Id: I9816db0b61150b254e1079a71e8fb5a392ad832c
2018-03-15 03:03:51 +00:00
TreeHugger Robot
5d9617c439 Merge "Add notification category: CATEGORY_NAVIGATION; Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION." into pi-dev 2018-03-15 03:00:46 +00:00
TreeHugger Robot
dbeb6bc3f1 Merge "WifiConfiguration: Undeprecate WPA_PSK" into pi-dev 2018-03-15 02:11:46 +00:00
Suprabh Shukla
d1003fad76 Merge "Unhiding APIs in UsageEvents for public use" into pi-dev am: b33cef07f2
am: 1495de2f15

Change-Id: Ia665dbac4683094e4e43f270ecd9feb40139d92d
2018-03-15 01:51:00 +00:00
TreeHugger Robot
b33cef07f2 Merge "Unhiding APIs in UsageEvents for public use" into pi-dev 2018-03-15 01:08:33 +00:00
Yohei Yukawa
386f50e04f Add IMS#BACK_DISPOSITION_ADJUST_NOTHING
This is a follow up CL to our previous attempt [1] to make
InputMethodService#setBackDisposition() work and make sense.

Based on the feedback from several IME developers, we learned that
InputMethodService#setBackDisposition() is still confusing.

My conclusion is that trying to reuse existing flags was a mistake.
Here are the rationale for deprecating those two flags.

 * BACK_DISPOSITION_WILL_NOT_DISMISS

   This flag had never been used until we started using it in our
   previous CL [1].  However, it turns out that what this flag means
   is hard to understand because its JavaDoc only says
      "This input method will not consume the back key."
   To address the original goal of Bug 38513361, we can (and should)
   introduce a new flag rather than reusing this confusing flag.
   Deprecating this flag should have no impact because it had never
   been used.

 * BACK_DISPOSITION_WILL_DISMISS

   On pre-P devices IME could abuse this flag to override the back
   button to "dismiss" mode even after IME lost the focus.  On the
   other hand, as far as we know there is no good use case for this
   flag.  Hence rather than trying to fix such an abuse scenario, we
   should just deprecate this flag.

Instead, a newly introduced flag BACK_DISPOSITION_ADJUST_NOTHING
should be sufficient to achieve the original goal of Bug 38513361.
This flag does not rely on the concept "dismiss" and key event
handling hence it would be much easier to maintain.

 [1]: I99e7c413fe1a93f8d8cff897b5c5f0947690d2c0
      3fecef119e

Fix: 74403102
Test: atest CtsInputMethodTestCases
Change-Id: I064209c40da79fffb2627e8f580818a793017b1f
2018-03-14 23:42:21 +00:00
Roshan Pius
8f1a910ad8 WifiConfiguration: Undeprecate WPA_PSK
This is needed for client mode operations for configuring WPA_PSK
networks. There is no alternative public value for WPA_PSK.
The intention was to deprecate usage of this value for AP
mode, but since we share the same object across client & AP mode
operations, we cannot mark this field deprecated.

Bug: 72332080
Test: make update-api
Change-Id: I75f675b630080d853422f945d7cbc37c5f205fde
2018-03-14 15:17:00 -07:00
Adora Zhang
aa90e8781f Add notification category: CATEGORY_NAVIGATION;
Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION.

Bug: 74546526
Test: runtest -x tests/app/src/android/app/cts/NotificationTest.java

Change-Id: Ib997992e039d2eddbd9c744816c35e279f9f9682
2018-03-14 14:53:26 -07:00
Suprabh Shukla
4e12de81b8 Unhiding APIs in UsageEvents for public use
These apis are needed to interpret standby bucket change history
when using UsageStatsManager#queryEventsForSelf

Test: atest android.app.usage.cts.UsageStatsTest#testQueryEventsForSelf

Bug: 71906213
Change-Id: Ib9f458bf32089ad30c97eca9dd5cc4df5a392191
2018-03-14 14:27:09 -07:00
Jason Monk
9092bdeb30 Merge "Add API to get currently pinned slices" into pi-dev am: 98c1d17cb4
am: 241a3a824d

Change-Id: I068f5a58ad82b31fad02209520f4890df5b8faff
2018-03-14 20:54:13 +00:00
TreeHugger Robot
98c1d17cb4 Merge "Add API to get currently pinned slices" into pi-dev 2018-03-14 20:12:54 +00:00
TreeHugger Robot
77dda37557 Merge "Refactor AddUserAuthArgs for extensibility" 2018-03-14 18:43:23 +00:00
Dianne Hackborn
8a1330c518 Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev am: bf5387edd8
am: a31cb855f0

Change-Id: I0f97a84092e511024bbb55eac9074adc277dda4a
2018-03-14 04:55:21 +00:00
Dianne Hackborn
bf5387edd8 Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev 2018-03-14 03:02:20 +00:00
Qingxi Li
59c833a199 Merge "Add API to check extended APDU Supported" into pi-dev am: d78e0451ea
am: 94b00b6b16

Change-Id: Ib71cd5c970113c86599ce8140b896811785c82ac
2018-03-14 02:20:59 +00:00
Yin-Chia Yeh
7a29d074a8 Merge "Revert "Camera: SessionConfiguration should use Executors"" into pi-dev am: 6896508045
am: 2ccd6d1ea6

Change-Id: I9c9c4318c88fc125d629c043808dc41c1bdd9957
2018-03-14 01:55:40 +00:00
Seigo Nonaka
14b2e32af6 Merge "Unhide getWeight of Typeface" into pi-dev am: 1b8333d1fb
am: e039c5f543

Change-Id: Ied7efc7895fe1a38352ea49c21c3cd136716fef2
2018-03-14 01:05:38 +00:00
Qingxi Li
d78e0451ea Merge "Add API to check extended APDU Supported" into pi-dev 2018-03-13 23:00:10 +00:00
TreeHugger Robot
6896508045 Merge "Revert "Camera: SessionConfiguration should use Executors"" into pi-dev 2018-03-13 22:44:21 +00:00
TreeHugger Robot
1b8333d1fb Merge "Unhide getWeight of Typeface" into pi-dev 2018-03-13 22:24:41 +00:00
Dianne Hackborn
bf1b57d856 Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi
Add a new platform-only permission for being able to change
app ops mode, so nothing outside of the platform can do this.

Bug: 62342672
Test: Booted, ran, settings works, shell works, apps install
Change-Id: I372e649c019a8f9b95919ff0da6f56612d7061c2
2018-03-13 14:51:30 -07:00
Yin-Chia Yeh
90d6fccf01 Revert "Camera: SessionConfiguration should use Executors"
This reverts commit 004e73c38c.

Bug: 74605221
Bug: 73953366
Change-Id: I1665c3d235434f57a4cd4aa5f082720b83ac10cc
2018-03-13 20:57:42 +00:00
Brad Ebinger
fc1ac6c9a8 Merge "Support Dynamic ImsService Querying" into pi-dev 2018-03-13 20:53:53 +00:00
Michael Wright
ccf1186bd8 Merge "Expose the new brightness permissions as test APIs." into pi-dev am: 3ed6c6330a
am: 6991d9df09

Change-Id: I85b309cb36855aabe5a1dcae3d06d660b8859d8e
2018-03-13 20:52:34 +00:00
Qingxi Li
346bddee19 Add API to check extended APDU Supported
Add API UiccSlotInfo#getIsExtendedApduSupported

Bug: 68999147
Test: TreeHugger & E2E
Change-Id: Ia400a23c35332356deaa214861f6f5ffe47c8092
2018-03-13 13:41:50 -07:00
Michael Wright
6991d9df09 Merge "Expose the new brightness permissions as test APIs." into pi-dev
am: 3ed6c6330a

Change-Id: I11457ba1b8cfb068da6b7b0df29571dd5522fee3
2018-03-13 19:55:56 +00:00
TreeHugger Robot
3ed6c6330a Merge "Expose the new brightness permissions as test APIs." into pi-dev 2018-03-13 19:20:47 +00:00
Brad Ebinger
9c750fe77f Support Dynamic ImsService Querying
1) Provide a "default" impl for MmTelFeature
instead of returning null.

2) Introduce a FeatureSlotPair, which maps a SIM
slot ID to a ImsFeature. This allows the ImsService
to provide which features it supports for multi-SIM
phones.

3) Pipe through ImsResolver state to help prevent IMS
operation when the ImsResolver is in the process of
figuring out feature capabilities.

Test: Telephony ImsService test app, telephony unit tests
Bug: 72642524

Merged-In: I4d7e9ba630739ade83e3242488f330ea6e73bbd7
Change-Id: Idb95f7651af200026d62e8b29eaed30bc0ebc9d3
2018-03-13 11:06:38 -07:00
Jason Monk
3107c66114 Merge "Run slice callbacks on thread they come in on" into pi-dev am: a033fa7fdc
am: f7af1cb1c6

Change-Id: I8e5d793b8e3614610f0e960729644dcc86a94908
2018-03-13 14:16:02 +00:00
Jason Monk
f7af1cb1c6 Merge "Run slice callbacks on thread they come in on" into pi-dev
am: a033fa7fdc

Change-Id: Ibb4ff6fc540f50e585ed0dcbb5e7eb25a472ce69
2018-03-13 14:05:56 +00:00
TreeHugger Robot
a033fa7fdc Merge "Run slice callbacks on thread they come in on" into pi-dev 2018-03-13 13:54:18 +00:00
Chong Zhang
e40d35fa08 Merge "heif: add option for specifying bitmap pixel format" into pi-dev am: 8807436378
am: 7986a16651

Change-Id: I04f6b209e215138d5e4b3b365274ca9700704f7d
2018-03-13 06:18:56 +00:00
Brad Ebinger
c8f825e47d Merge "Merge "Support Dynamic ImsService Querying" am: 6fc1a2f0d4 am: 5984254b27" into pi-dev-plus-aosp
am: d0a12f3cff

Change-Id: Ia78917a294b38e7ec21f1f5a986ebd12383fb79e
2018-03-13 03:58:37 +00:00
Dongwon Kang
80b7543b86 Merge "Make MP2 operations asynchronous and send matching notifications" into pi-dev am: 2b83982b2b
am: 6841b48541

Change-Id: I3c4a51cdb924a2c726429107c036994b3c13e464
2018-03-13 03:38:02 +00:00
Chong Zhang
7986a16651 Merge "heif: add option for specifying bitmap pixel format" into pi-dev
am: 8807436378

Change-Id: If65fcb4cced51af04bdecd58fc27799dc8483b10
2018-03-13 03:09:15 +00:00
TreeHugger Robot
8807436378 Merge "heif: add option for specifying bitmap pixel format" into pi-dev 2018-03-13 02:29:25 +00:00
Chen Xu
9726591d6b Merge "Carrier id api rename" into pi-dev am: f78767d2f9
am: d877fdb2b1

Change-Id: I8e2b41d623f7b213cff5e4f7d57977630294fc9d
2018-03-13 02:25:20 +00:00
Adrian Roos
99db7ebbaa Merge "DisplayCutout: Support more than one cutout" into pi-dev am: 5d92e72482
am: 2125a78980

Change-Id: I97042e60d0222efaeee65ac78f85d22e281ac87a
2018-03-13 02:18:14 +00:00
Android Build Merger (Role)
d0a12f3cff Merge "Merge "Support Dynamic ImsService Querying" am: 6fc1a2f0d4 am: 5984254b27" into pi-dev-plus-aosp 2018-03-13 01:09:41 +00:00
Brad Ebinger
b4c270331a Merge "Support Dynamic ImsService Querying" am: 6fc1a2f0d4
am: 5984254b27

Change-Id: I4d7e9ba630739ade83e3242488f330ea6e73bbd7
2018-03-13 01:08:18 +00:00
Julia Reynolds
a22a36deb8 Merge "Log interruptive notifications" into pi-dev am: dcf12d4a39
am: 318b49c2ab

Change-Id: Ia2d69825a3631e4e821cec0ec97c894d1886b57f
2018-03-13 00:42:55 +00:00
TreeHugger Robot
2b83982b2b Merge "Make MP2 operations asynchronous and send matching notifications" into pi-dev 2018-03-13 00:09:02 +00:00
Felipe Leme
0890a69494 Merge "Implemented WebView.isVisibleToUserForAutofill()" into pi-dev am: ec174b28c4
am: 6b9a99b594

Change-Id: Ic4488d9750403041cf5b7857edfd517f75aebcc7
2018-03-12 23:32:55 +00:00
Brad Ebinger
6fc1a2f0d4 Merge "Support Dynamic ImsService Querying" 2018-03-12 22:53:47 +00:00
Mohamed Abdalkader
4286250f1a Merge "Unhide ImsCallProfileConstructor." into pi-dev am: 7333793eaa
am: 9bef850ad9

Change-Id: I81ba980a8214e3d8ae46f908e96cf8a06c38f082
2018-03-12 22:51:06 +00:00