Commit Graph

309172 Commits

Author SHA1 Message Date
Paul Stewart
4ad314b463 Account for null client certificate
am: 1ca57a1d10

Change-Id: Id999634bb25a379a5cfdb47412323d2cc6d0cd30
2017-01-28 01:45:53 +00:00
Paul Stewart
cd463ff269 Add a client chain to WifiEnterpriseConfig
am: 291ddaef78

Change-Id: Ic8451631732bd3bfce7ff08f9f37b18745cda357
2017-01-28 01:45:05 +00:00
Treehugger Robot
c71b5dab72 Merge changes from topic 'enterprise-client-chain'
* changes:
  Test passing null cert/keys to WifiEnterpriseConfig
  Account for null client certificate
  Add a client chain to WifiEnterpriseConfig
2017-01-28 01:38:31 +00:00
Andrii Kulian
7211d2eba8 Rename flag that enables showing display content with keyguard
Renamed SHOW_WITH_INSECURE_LOCKSCREEN to CAN_SHOW_WITH_INSECURE_KEYGUARD.

Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: Ie03ee59730a9e9e715b2bad0a14fdd107b8c7c00
2017-01-27 17:27:11 -08:00
fionaxu
de56b1f00a add an API for sending secret dialer code
Telephony provides an pulic API for sending secret
dialer code with the format of *#*#code*#*#.
This API only sent out broadcast for the default dialer app
and is backgound-check compliant.

Bug:33753947
Test: Manual
Change-Id: I10665828e88be07d96c7f2568a0c6878abe2e21b
2017-01-27 17:18:34 -08:00
TreeHugger Robot
1df8f1ea95 Merge "Reverts ag/1803954 and ag/1828349 and left only split custom action" 2017-01-28 01:13:25 +00:00
Vladislav Kaznacheev
e1f5e13c0f Do not return cryptic strings from ClipData.Item.coerceToText
Currently, when ClipData contains an URI of "content", "file" or
"android.resource" scheme, and the URI cannot be opened
as a stream for some reason, then ClipData.Item.coerceToText
(or coerceToHtmlText) return the URI's textual representation.

This representation is not useful for a user at all.

Returning an empty string instead.

Bug: 28929820
Test: Drag a file from Files app to any text input, no URI should be inserted
Change-Id: I21a23b673ef145a008427e9177403b5b1a41b898
2017-01-27 16:56:40 -08:00
Adam Lesinski
c6aada9c57 LoadedArsc: Support feature splits.
Test: make libandroidfw_tests
Change-Id: I278273e688da597f4af86dd55f87750501ef8154
2017-01-27 16:52:53 -08:00
Adam Powell
5f3a05c15f Primary navigation fragments
Port of I82cd22cda6e9ee22fe293c36859e99f49d36a129 from frameworks/support

Add API to track the "primary navigation fragment" for a
FragmentManager. This allows designating one active fragment in a
FragmentManager as the intended nested recipient of navigation actions
such as popping the back stack.

The FragmentManager popBackStack methods will now delegate to the
child FragmentManager of the current primary navigation fragment first
before trying to pop its own back stack. This can only happen if a
back stack transaction id or back stack entry name is not provided to
the pop operation, as these names and ids are namespaced to each
individual FragmentManager.

Primary navigation fragments are set as part of a FragmentTransaction
and follow the associated expectations. Transactions added to the back
stack will be fully reversed when popped, restoring the previous
primary navigation fragment for the FragmentManager. If a primary
navigation fragment is removed from the FragmentManager, the primary
navigation fragment will be set to null.

Bug: 30596279
Test: CTS
Change-Id: Ied7c1515f27142d6f4cd523f16eb35d38a2a2380
2017-01-27 16:51:03 -08:00
Vladislav Kaznacheev
b143ff6b6c Handle SecurityException in ClipData.Item.coerceToText
Catch SecurityException and print a log warning.

The most likely reason for such SecurityException is
a drag and drop operation with a resource (such as a file)
for which the recipient app has no permissions.

Bug: 34716083
Test: Drag a file from Files app to Docs, Docs should not crash
Change-Id: Ib4ebbb01bd3ca87b221e15fac769368272ff4fc4
2017-01-27 16:39:13 -08:00
Udam Saini
3742ccf8b5 Moves layout code from java files to layout xml
Test: manual ui verification
Change-Id: I7d15dc1a25845741c3d165f3f1d33cee2c2d4514
2017-01-27 16:32:40 -08:00
Brad Ebinger
3be1f6fdcf Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f2519abc am: 18140a6784
am: cc778dae0d  -s ours

Change-Id: Icc78af1d4706a81ba7f4151201e3256b0491f1c5
2017-01-28 00:10:51 +00:00
TreeHugger Robot
9363c69542 Merge "Added dump() to AutoFillUI." 2017-01-27 23:32:13 +00:00
Zak Cohen
db6ca49dd0 Add a home intent category for VR headset UI mode.
Bug: 30997244
Test: build only
Change-Id: Ibed6d24f5655ae7280c7de42cd5258b25d5af9d8
2017-01-27 15:26:07 -08:00
Matthew Ng
32acecc073 Reverts ag/1803954 and ag/1828349 and left only split custom action
Test: manual - used Talkback
Fixes: 29360763
Change-Id: I50a5fd8fb438cba045ab4e86b4495af8a8fdf8f3
2017-01-27 15:23:45 -08:00
John Reck
6cc0b8ac03 Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701 am: e4c2e8f303 am: 3c2837e77e
am: 6e4f930457  -s ours

Change-Id: I39dd552e6d3e6d8abed6124078ec0a9db571eac3
2017-01-27 23:17:05 +00:00
Brad Ebinger
cc778dae0d Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f2519abc
am: 18140a6784

Change-Id: I1c29dcbdd4f1f1f97bf2e3eb3a1f0bdc83613676
2017-01-27 23:13:36 +00:00
TreeHugger Robot
c7b21e2263 Merge "Fix ListView click handling under new focus rules" 2017-01-27 23:11:45 +00:00
Brad Ebinger
18140a6784 Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549
am: b5f2519abc

Change-Id: I54c577f6c4bd68f6328572651315e056270ee807
2017-01-27 23:08:31 +00:00
John Reck
6e4f930457 Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701 am: e4c2e8f303
am: 3c2837e77e

Change-Id: Idbcb9dfeac57036d3621474ee65ba967cc7bc499
2017-01-27 23:05:52 +00:00
TreeHugger Robot
1b167ae047 Merge "port notificaiton logs to Tron v2" 2017-01-27 23:04:09 +00:00
Brad Ebinger
b5f2519abc Merge "Adds @hide ImsResolver API and device overlays (2/3)"
am: d063843549

Change-Id: I82a38c0cb2b7b229b96f0a617f8b7c921eb6d3a9
2017-01-27 23:03:47 +00:00
John Reck
3c2837e77e Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701
am: e4c2e8f303

Change-Id: Id6af451556fde8eefac8076735e625911f8bf272
2017-01-27 23:02:41 +00:00
Ray Essick
9a79692e23 Merge "API access to mediametrics" 2017-01-27 22:59:40 +00:00
John Reck
e4c2e8f303 Merge "Fix a bunch of repeated reads of a ro.* property"
am: 4265991701

Change-Id: I996fbd1002ef788a768b575ab6d2177dc9ab5af1
2017-01-27 22:57:29 +00:00
Treehugger Robot
d063843549 Merge "Adds @hide ImsResolver API and device overlays (2/3)" 2017-01-27 22:55:16 +00:00
Treehugger Robot
4265991701 Merge "Fix a bunch of repeated reads of a ro.* property" 2017-01-27 22:49:04 +00:00
Adam Lesinski
90572a4ab8 Merge "libandroidfw: Add new support for shared libraries" 2017-01-27 22:30:24 +00:00
TreeHugger Robot
904aca762c Merge "Move autofill-specific logic from EditText to TextView." 2017-01-27 22:27:50 +00:00
Adrian Roos
c68b34191a Merge "AOD: Fix fallout from new Ambient Display" 2017-01-27 22:14:12 +00:00
Makoto Onuki
efdec8f568 Do not call RecoverySystem with DPMS lock held
Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.

Test: Manually tested wipeData() with ApiDemos, both on 1) the primary user,
2) a secondary user and 3) work profile.

Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests

Bug 30681079

Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
Merged-in: Ib97a92a6af87a5589d2643b9ae0522395735e1a5
2017-01-27 14:08:01 -08:00
koji.x.shigehara
69c893aeaf Merge "Handles #9 as Dial number" am: 3b24c6e1a2 am: 4710c36e8d am: 679ef0013e
am: 8247102e16

Change-Id: Iaa27ecd1dfac0240b6ccc9aeec023d4140b06128
2017-01-27 21:51:02 +00:00
Jason Long
2b004b3aba Move autofill focus triggers from TextView to View.
Bug: 31001899
Change-Id: I6fd01b86936b3140edf87ac63292c77015bb019d
Test: Manual
2017-01-27 13:47:37 -08:00
koji.x.shigehara
8247102e16 Merge "Handles #9 as Dial number" am: 3b24c6e1a2 am: 4710c36e8d
am: 679ef0013e

Change-Id: I8697aa07662c7f00f0f5b678f63a1f44a39c08fb
2017-01-27 21:46:21 +00:00
koji.x.shigehara
679ef0013e Merge "Handles #9 as Dial number" am: 3b24c6e1a2
am: 4710c36e8d

Change-Id: I2ea8c5bbd06b0b58609f27039a5fef0d9b37cb9e
2017-01-27 21:42:28 +00:00
Jack Yu
c79a275178 DO NOT MERGE - Fixed the logic for tethering provisioning re-evaluation
am: cf7f4ba3fa  -s ours

Change-Id: Ib7ca9d3e105a23e623aca33a73111bfe7df7e1a8
2017-01-27 21:38:40 +00:00
koji.x.shigehara
4710c36e8d Merge "Handles #9 as Dial number"
am: 3b24c6e1a2

Change-Id: I71b8c65b0dc1fd813f2f962074db217df429c8ef
2017-01-27 21:38:26 +00:00
TreeHugger Robot
9dd20d23e0 Merge "Initial, unpolished version of DatasetPicker." 2017-01-27 21:34:32 +00:00
Adam Powell
995c043acf Fix ListView click handling under new focus rules
ListView historically uses View#hasFocusable to change signifcant
behavior around the clickability of items: an item view with any
focusable children could not be clicked via an item click
listener. Many apps therefore have sub-views in list items that are
deliberately clickable, but not focusable. This comes up in cases like
overflow menu buttons on list items.

Now that we have auto-focusability triggered when a view is set as
clickable, the expectations of apps using this pattern have changed.

Create an overload of hasFocusable that optionally can filter out
auto-focusable views in its results. Have ListView use it to preserve
its previous behavior. This isn't public API for now, but perhaps it
should be if this pattern shows up in practice in places other than
ListView.

Bug: 34756767
Change-Id: Ie71ee6e388449f634b30f9162a8b3fa578e32db8
2017-01-27 13:31:44 -08:00
Treehugger Robot
3b24c6e1a2 Merge "Handles #9 as Dial number" 2017-01-27 21:30:42 +00:00
Jack Yu
cf7f4ba3fa DO NOT MERGE - Fixed the logic for tethering provisioning re-evaluation
Previously we only re-evaluate provisioning for SIM swap case
The new logic covers both SIM swap case
(ABSENT->NOT_READY->UNKNOWN->READY->LOADED) and modem reset
case (NOT_READY->READY->LOADED)

Test: Manual
bug: 33815946

Merged-In: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
Change-Id: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
2017-01-27 13:30:01 -08:00
TreeHugger Robot
e244fd33b1 Merge "Create a jank test to measure clipped ListView performance (part 2)" 2017-01-27 21:19:20 +00:00
Stan Iliev
bf25627558 Create a jank test to measure clipped ListView performance (part 2)
Write a new UiBench test that opens and closes navigation drawer
on top of a trivial ListView.

Test: Built and ran UiBench tests.
Change-Id: I25413e27f78c756bb48e6dcaa92990592bb5b9de
2017-01-27 16:16:26 -05:00
Jack Yu
2109ce6efa Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev am: d9ab9df05b
am: b38770b58e  -s ours

Change-Id: Ib90a249d6227a4cccf895cb27235382e700fede9
2017-01-27 21:12:09 +00:00
Jack Yu
1d0f8ad10d Fixed the logic for tethering provisioning re-evaluation am: 3294256ba5 -s ours
am: df4a6bc4de  -s ours

Change-Id: Ic90fc3e0e41820ea2178dd70ae60fee56f2980f4
2017-01-27 21:10:55 +00:00
Brad Ebinger
e6ec7d8b8f Adds @hide ImsResolver API and device overlays (2/3)
- Adds config_ims_package device overlay, which specifies the default
package name to bind to.
- Adds config_dynamic_bind_ims device overlay, which determines
whether or not the new dynamic binding system is used.
- Adds @hide TelephonyManager API to interface with the ImsResolver

Test: Manual
Merged-In: I82a41da00e6da34629a40db431f13b968dfafe2e
Change-Id: I82a41da00e6da34629a40db431f13b968dfafe2e
2017-01-27 13:09:37 -08:00
Jack Yu
b38770b58e Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev
am: d9ab9df05b

Change-Id: I282418ddb3043e12c48edf23933d1bea4c35c3e0
2017-01-27 21:07:09 +00:00
Jack Yu
df4a6bc4de Fixed the logic for tethering provisioning re-evaluation
am: 3294256ba5  -s ours

Change-Id: I153971fb47656ac122f786ed2f86f6302abe48e7
2017-01-27 21:07:00 +00:00
TreeHugger Robot
6fd52cd04b Merge "Introduced UserDataPreparer class" 2017-01-27 20:57:33 +00:00
Android Build Merger (Role)
e3eb296cb4 Merge "Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b am: e163e7b943 am: bb15b50ffc am: aa70426388" 2017-01-27 20:51:34 +00:00