OSDN Git Service

android-x86/frameworks-base.git
7 years agoAdd UiBench jank and macrobench tests for saveLayer performance
Stan Iliev [Fri, 27 Jan 2017 19:30:23 +0000 (14:30 -0500)]
Add UiBench jank and macrobench tests for saveLayer performance

Create 2 jank tests and 1 macrobench that measure saveLayer
performance:
- Fling a ListView, which has a vertical fading edge.
- Draw a canvas with 20 saveLayer/restore interleaved with other
drawText and drawRect ops.

Test: built and ran UiBench jank and macrobench tests.
Change-Id: I5a50feb7431d597c92c7a49031505d41f397d175

7 years agoMerge "Profile owners on a user can communicate with device owners"
Esteban Talavera [Mon, 30 Jan 2017 11:33:34 +0000 (11:33 +0000)]
Merge "Profile owners on a user can communicate with device owners"

7 years agoMerge "Test to encourage new settings to be backed up"
Bryan Mawhinney [Mon, 30 Jan 2017 10:31:58 +0000 (10:31 +0000)]
Merge "Test to encourage new settings to be backed up"

7 years agoMerge "Implement .xml font resource support"
TreeHugger Robot [Mon, 30 Jan 2017 09:37:10 +0000 (09:37 +0000)]
Merge "Implement .xml font resource support"

7 years agoMerge "Remove a redundant param in getDefaultEnabledImes"
TreeHugger Robot [Mon, 30 Jan 2017 02:58:07 +0000 (02:58 +0000)]
Merge "Remove a redundant param in getDefaultEnabledImes"

7 years agoMerge "Minor code clean-ups with no behavior change"
TreeHugger Robot [Mon, 30 Jan 2017 02:16:05 +0000 (02:16 +0000)]
Merge "Minor code clean-ups with no behavior change"

7 years agoRemove a redundant param in getDefaultEnabledImes
Yohei Yukawa [Tue, 24 Jan 2017 00:17:11 +0000 (16:17 -0800)]
Remove a redundant param in getDefaultEnabledImes

With the previous CL [1], systemReady parameter in
InputMethodUtils.getDefaultEnabledImes() is guaranteed to be true.
Hence this CL removes that parameter. There should be no behavior change
in this CL.

 [1]: I5b37c450db4b25b3e635b6d634293a34eec8b9d4
      7924782c000733b2d7a180701b74988f0154adee

Test: adb shell am instrument -w -e class com.android.internal.inputmethod.InputMethodUtilsTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug: 32343335
Change-Id: Ia14d12a4e21d0e2e22bfe0bd8d496f48058c5525

7 years agoMinor code clean-ups with no behavior change
Yohei Yukawa [Sun, 29 Jan 2017 22:08:17 +0000 (14:08 -0800)]
Minor code clean-ups with no behavior change

As another preparation CL to work on Bug 7254002, this CL cleans up
miscellaneous minor coding style issues that do not cause any
user-visible problems.

 - Add final keyboard to classes that are not intended to be extended.
 - Add static keyboard to nested classes if possible.
 - Fix a typo in log message.
 - Remove a redundant synchronized keyword in method signature.
 - Remove unused class fields.

Test: checkbuild
Bug: 7254002
Change-Id: I3b54179116a74cafc99a3dfd3f2a429a7111c12e

7 years agoMerge "KeySetManagerService: prevent NPE" am: c66327149a am: 51ad0f67d2 am: 7adb348796
Thecrazyskull [Sun, 29 Jan 2017 17:35:23 +0000 (17:35 +0000)]
Merge "KeySetManagerService: prevent NPE" am: c66327149a am: 51ad0f67d2 am: 7adb348796
am: 8734438320

Change-Id: I8618393edf8c2c41663dfb457588ac4f9511239c

7 years agoMerge "KeySetManagerService: prevent NPE" am: c66327149a am: 51ad0f67d2
Thecrazyskull [Sun, 29 Jan 2017 17:30:47 +0000 (17:30 +0000)]
Merge "KeySetManagerService: prevent NPE" am: c66327149a am: 51ad0f67d2
am: 7adb348796

Change-Id: Icc4d2d025c03cc71557e359bf8f4f230d38ef595

7 years agoMerge "KeySetManagerService: prevent NPE" am: c66327149a
Thecrazyskull [Sun, 29 Jan 2017 17:26:47 +0000 (17:26 +0000)]
Merge "KeySetManagerService: prevent NPE" am: c66327149a
am: 51ad0f67d2

Change-Id: I72d62e1d1f3d2b6db616762e724c1608a1e487c8

7 years agoMerge "KeySetManagerService: prevent NPE"
Thecrazyskull [Sun, 29 Jan 2017 17:22:13 +0000 (17:22 +0000)]
Merge "KeySetManagerService: prevent NPE"
am: c66327149a

Change-Id: I09d6fb3e2644ab9330b10bd67c44e61a204e589b

7 years agoMerge "KeySetManagerService: prevent NPE"
Treehugger Robot [Sun, 29 Jan 2017 17:14:36 +0000 (17:14 +0000)]
Merge "KeySetManagerService: prevent NPE"

7 years agoMerge "Simplify stub TextServicesManager in layoutlib"
Yohei Yukawa [Sun, 29 Jan 2017 02:49:29 +0000 (02:49 +0000)]
Merge "Simplify stub TextServicesManager in layoutlib"

7 years agoMerge "add an API for sending secret dialer code"
Chen Xu [Sat, 28 Jan 2017 17:00:54 +0000 (17:00 +0000)]
Merge "add an API for sending secret dialer code"

7 years agoMerge "Rename flag that enables showing display content with keyguard"
Andrii Kulian [Sat, 28 Jan 2017 04:08:31 +0000 (04:08 +0000)]
Merge "Rename flag that enables showing display content with keyguard"

7 years agoMerge changes from topic 'enterprise-client-chain' am: c71b5dab72 am: fc5430a39c...
Paul Stewart [Sat, 28 Jan 2017 02:20:16 +0000 (02:20 +0000)]
Merge changes from topic 'enterprise-client-chain' am: c71b5dab72 am: fc5430a39c am: a377b026f6
am: 1a05097d04

Change-Id: Ib0f72608343b217a97c46a06a8065e821d7a17c4

7 years agoMerge changes from topic 'am-febb6164619c46f681eb6dc8a6c58e06'
Android Build Merger (Role) [Sat, 28 Jan 2017 02:16:37 +0000 (02:16 +0000)]
Merge changes from topic 'am-febb6164619c46f681eb6dc8a6c58e06'

* changes:
  Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16 am: 3bac61ac86 am: 96c87f7a9b
  Account for null client certificate am: 1ca57a1d10 am: 4ad314b463 am: 25eff7731a am: b35b219516
  Add a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269 am: 80b5793645 am: 9c9d4f6f6d  -s ours

7 years agoMerge "Moves layout code from java files to layout xml"
TreeHugger Robot [Sat, 28 Jan 2017 02:16:27 +0000 (02:16 +0000)]
Merge "Moves layout code from java files to layout xml"

7 years agoTest passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16...
Paul Stewart [Sat, 28 Jan 2017 02:15:08 +0000 (02:15 +0000)]
Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16 am: 3bac61ac86
am: 96c87f7a9b

Change-Id: Iddf9cb68c3026d6fdec0550a4b7f1a6c84f6139d

7 years agoAccount for null client certificate am: 1ca57a1d10 am: 4ad314b463 am: 25eff7731a
Paul Stewart [Sat, 28 Jan 2017 02:14:09 +0000 (02:14 +0000)]
Account for null client certificate am: 1ca57a1d10 am: 4ad314b463 am: 25eff7731a
am: b35b219516

Change-Id: Ic773470d1b47779d6049d422a372c847b94ad766

7 years agoAdd a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269 am: 80b5793645
Paul Stewart [Sat, 28 Jan 2017 02:12:51 +0000 (02:12 +0000)]
Add a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269 am: 80b5793645
am: 9c9d4f6f6d  -s ours

Change-Id: I29a271bf5db7cede0caa4b38a15162de002af167

7 years agoMerge changes from topic 'enterprise-client-chain' am: c71b5dab72 am: fc5430a39c
Paul Stewart [Sat, 28 Jan 2017 02:06:10 +0000 (02:06 +0000)]
Merge changes from topic 'enterprise-client-chain' am: c71b5dab72 am: fc5430a39c
am: a377b026f6

Change-Id: I80d26378aa4e82aec5a79054ad59f3385ac0e8d0

7 years agoTest passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16
Paul Stewart [Sat, 28 Jan 2017 02:01:40 +0000 (02:01 +0000)]
Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16
am: 3bac61ac86

Change-Id: I5c8af5dcd505002d815886f4a1ea30496411a35f

7 years agoAccount for null client certificate am: 1ca57a1d10 am: 4ad314b463
Paul Stewart [Sat, 28 Jan 2017 02:00:50 +0000 (02:00 +0000)]
Account for null client certificate am: 1ca57a1d10 am: 4ad314b463
am: 25eff7731a

Change-Id: I2bd868e534ca1a5960ac9855bd40a91f705b9772

7 years agoAdd a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269
Paul Stewart [Sat, 28 Jan 2017 01:59:40 +0000 (01:59 +0000)]
Add a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269
am: 80b5793645

Change-Id: I11310cfd06db4357ec1ee94139ebdb2e2f40f771

7 years agoMerge changes from topic 'enterprise-client-chain' am: c71b5dab72
Paul Stewart [Sat, 28 Jan 2017 01:59:39 +0000 (01:59 +0000)]
Merge changes from topic 'enterprise-client-chain' am: c71b5dab72
am: fc5430a39c

Change-Id: I2850cbafd7800284d259e04e2889af68d3272ab5

7 years agoMerge "Move autofill focus triggers from TextView to View."
TreeHugger Robot [Sat, 28 Jan 2017 01:54:44 +0000 (01:54 +0000)]
Merge "Move autofill focus triggers from TextView to View."

7 years agoTest passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad
Paul Stewart [Sat, 28 Jan 2017 01:54:47 +0000 (01:54 +0000)]
Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad
am: cb79016b16

Change-Id: Ib96c9b9034d5fd6fb0477ca274e4cbce86677d0e

7 years agoAccount for null client certificate am: 1ca57a1d10
Paul Stewart [Sat, 28 Jan 2017 01:53:52 +0000 (01:53 +0000)]
Account for null client certificate am: 1ca57a1d10
am: 4ad314b463

Change-Id: I50138c766a4ca1f697bbe4c2285bc0bc8c2985f4

7 years agoAdd a client chain to WifiEnterpriseConfig am: 291ddaef78
Paul Stewart [Sat, 28 Jan 2017 01:52:43 +0000 (01:52 +0000)]
Add a client chain to WifiEnterpriseConfig am: 291ddaef78
am: cd463ff269

Change-Id: I3625766bb97cf2bf4ab8a6a0d518c2b876069e23

7 years agoMerge changes from topic 'enterprise-client-chain'
Paul Stewart [Sat, 28 Jan 2017 01:52:41 +0000 (01:52 +0000)]
Merge changes from topic 'enterprise-client-chain'
am: c71b5dab72

Change-Id: Icfae9ac89759cd4d18f63dd2da17587bb7fdf96d

7 years agoTest passing null cert/keys to WifiEnterpriseConfig
Paul Stewart [Sat, 28 Jan 2017 01:46:52 +0000 (01:46 +0000)]
Test passing null cert/keys to WifiEnterpriseConfig
am: 88b3c589ad

Change-Id: Ia92c2ad4b7562250aa69d3e8dbb3b8d8607d4136

7 years agoAccount for null client certificate
Paul Stewart [Sat, 28 Jan 2017 01:45:53 +0000 (01:45 +0000)]
Account for null client certificate
am: 1ca57a1d10

Change-Id: Id999634bb25a379a5cfdb47412323d2cc6d0cd30

7 years agoAdd a client chain to WifiEnterpriseConfig
Paul Stewart [Sat, 28 Jan 2017 01:45:05 +0000 (01:45 +0000)]
Add a client chain to WifiEnterpriseConfig
am: 291ddaef78

Change-Id: Ic8451631732bd3bfce7ff08f9f37b18745cda357

7 years agoMerge changes from topic 'enterprise-client-chain'
Treehugger Robot [Sat, 28 Jan 2017 01:38:30 +0000 (01:38 +0000)]
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

7 years agoRename flag that enables showing display content with keyguard
Andrii Kulian [Fri, 27 Jan 2017 23:58:05 +0000 (15:58 -0800)]
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

7 years agoadd an API for sending secret dialer code
fionaxu [Wed, 25 Jan 2017 05:49:37 +0000 (21:49 -0800)]
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

7 years agoMerge "Reverts ag/1803954 and ag/1828349 and left only split custom action"
TreeHugger Robot [Sat, 28 Jan 2017 01:13:22 +0000 (01:13 +0000)]
Merge "Reverts ag/1803954 and ag/1828349 and left only split custom action"

7 years agoMoves layout code from java files to layout xml
Udam Saini [Fri, 27 Jan 2017 20:16:21 +0000 (12:16 -0800)]
Moves layout code from java files to layout xml

Test: manual ui verification
Change-Id: I7d15dc1a25845741c3d165f3f1d33cee2c2d4514

7 years agoMerge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f25...
Brad Ebinger [Sat, 28 Jan 2017 00:10:51 +0000 (00:10 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f2519abc am: 18140a6784
am: cc778dae0d  -s ours

Change-Id: Icc78af1d4706a81ba7f4151201e3256b0491f1c5

7 years agoMerge "Added dump() to AutoFillUI."
TreeHugger Robot [Fri, 27 Jan 2017 23:32:09 +0000 (23:32 +0000)]
Merge "Added dump() to AutoFillUI."

7 years agoReverts ag/1803954 and ag/1828349 and left only split custom action
Matthew Ng [Thu, 26 Jan 2017 00:58:26 +0000 (16:58 -0800)]
Reverts ag/1803954 and ag/1828349 and left only split custom action

Test: manual - used Talkback
Fixes: 29360763
Change-Id: I50a5fd8fb438cba045ab4e86b4495af8a8fdf8f3

7 years agoMerge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701 am: e4c2e8f30...
John Reck [Fri, 27 Jan 2017 23:17:05 +0000 (23:17 +0000)]
Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701 am: e4c2e8f303 am: 3c2837e77e
am: 6e4f930457  -s ours

Change-Id: I39dd552e6d3e6d8abed6124078ec0a9db571eac3

7 years agoMerge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f25...
Brad Ebinger [Fri, 27 Jan 2017 23:13:36 +0000 (23:13 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f2519abc
am: 18140a6784

Change-Id: I1c29dcbdd4f1f1f97bf2e3eb3a1f0bdc83613676

7 years agoMerge "Fix ListView click handling under new focus rules"
TreeHugger Robot [Fri, 27 Jan 2017 23:11:42 +0000 (23:11 +0000)]
Merge "Fix ListView click handling under new focus rules"

7 years agoMerge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549
Brad Ebinger [Fri, 27 Jan 2017 23:08:31 +0000 (23:08 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549
am: b5f2519abc

Change-Id: I54c577f6c4bd68f6328572651315e056270ee807

7 years agoMerge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701 am: e4c2e8f303
John Reck [Fri, 27 Jan 2017 23:05:52 +0000 (23:05 +0000)]
Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701 am: e4c2e8f303
am: 3c2837e77e

Change-Id: Idbcb9dfeac57036d3621474ee65ba967cc7bc499

7 years agoMerge "port notificaiton logs to Tron v2"
TreeHugger Robot [Fri, 27 Jan 2017 23:04:05 +0000 (23:04 +0000)]
Merge "port notificaiton logs to Tron v2"

7 years agoMerge "Adds @hide ImsResolver API and device overlays (2/3)"
Brad Ebinger [Fri, 27 Jan 2017 23:03:47 +0000 (23:03 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)"
am: d063843549

Change-Id: I82a38c0cb2b7b229b96f0a617f8b7c921eb6d3a9

7 years agoMerge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701
John Reck [Fri, 27 Jan 2017 23:02:41 +0000 (23:02 +0000)]
Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701
am: e4c2e8f303

Change-Id: Id6af451556fde8eefac8076735e625911f8bf272

7 years agoMerge "API access to mediametrics"
Ray Essick [Fri, 27 Jan 2017 22:59:37 +0000 (22:59 +0000)]
Merge "API access to mediametrics"

7 years agoMerge "Fix a bunch of repeated reads of a ro.* property"
John Reck [Fri, 27 Jan 2017 22:57:29 +0000 (22:57 +0000)]
Merge "Fix a bunch of repeated reads of a ro.* property"
am: 4265991701

Change-Id: I996fbd1002ef788a768b575ab6d2177dc9ab5af1

7 years agoMerge "Adds @hide ImsResolver API and device overlays (2/3)"
Treehugger Robot [Fri, 27 Jan 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)"

7 years agoMerge "Fix a bunch of repeated reads of a ro.* property"
Treehugger Robot [Fri, 27 Jan 2017 22:49:03 +0000 (22:49 +0000)]
Merge "Fix a bunch of repeated reads of a ro.* property"

7 years agoMerge "libandroidfw: Add new support for shared libraries"
Adam Lesinski [Fri, 27 Jan 2017 22:30:22 +0000 (22:30 +0000)]
Merge "libandroidfw: Add new support for shared libraries"

7 years agoMerge "Move autofill-specific logic from EditText to TextView."
TreeHugger Robot [Fri, 27 Jan 2017 22:27:47 +0000 (22:27 +0000)]
Merge "Move autofill-specific logic from EditText to TextView."

7 years agoMerge "AOD: Fix fallout from new Ambient Display"
Adrian Roos [Fri, 27 Jan 2017 22:14:08 +0000 (22:14 +0000)]
Merge "AOD: Fix fallout from new Ambient Display"

7 years agoMerge "Handles #9 as Dial number" am: 3b24c6e1a2 am: 4710c36e8d am: 679ef0013e
koji.x.shigehara [Fri, 27 Jan 2017 21:51:02 +0000 (21:51 +0000)]
Merge "Handles #9 as Dial number" am: 3b24c6e1a2 am: 4710c36e8d am: 679ef0013e
am: 8247102e16

Change-Id: Iaa27ecd1dfac0240b6ccc9aeec023d4140b06128

7 years agoMove autofill focus triggers from TextView to View.
Jason Long [Fri, 27 Jan 2017 08:40:49 +0000 (00:40 -0800)]
Move autofill focus triggers from TextView to View.

Bug: 31001899
Change-Id: I6fd01b86936b3140edf87ac63292c77015bb019d
Test: Manual

7 years agoMerge "Handles #9 as Dial number" am: 3b24c6e1a2 am: 4710c36e8d
koji.x.shigehara [Fri, 27 Jan 2017 21:46:21 +0000 (21:46 +0000)]
Merge "Handles #9 as Dial number" am: 3b24c6e1a2 am: 4710c36e8d
am: 679ef0013e

Change-Id: I8697aa07662c7f00f0f5b678f63a1f44a39c08fb

7 years agoMerge "Handles #9 as Dial number" am: 3b24c6e1a2
koji.x.shigehara [Fri, 27 Jan 2017 21:42:28 +0000 (21:42 +0000)]
Merge "Handles #9 as Dial number" am: 3b24c6e1a2
am: 4710c36e8d

Change-Id: I2ea8c5bbd06b0b58609f27039a5fef0d9b37cb9e

7 years agoDO NOT MERGE - Fixed the logic for tethering provisioning re-evaluation
Jack Yu [Fri, 27 Jan 2017 21:38:40 +0000 (21:38 +0000)]
DO NOT MERGE - Fixed the logic for tethering provisioning re-evaluation
am: cf7f4ba3fa  -s ours

Change-Id: Ib7ca9d3e105a23e623aca33a73111bfe7df7e1a8

7 years agoMerge "Handles #9 as Dial number"
koji.x.shigehara [Fri, 27 Jan 2017 21:38:26 +0000 (21:38 +0000)]
Merge "Handles #9 as Dial number"
am: 3b24c6e1a2

Change-Id: I71b8c65b0dc1fd813f2f962074db217df429c8ef

7 years agoMerge "Initial, unpolished version of DatasetPicker."
TreeHugger Robot [Fri, 27 Jan 2017 21:34:29 +0000 (21:34 +0000)]
Merge "Initial, unpolished version of DatasetPicker."

7 years agoFix ListView click handling under new focus rules
Adam Powell [Fri, 27 Jan 2017 21:05:14 +0000 (13:05 -0800)]
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

7 years agoMerge "Handles #9 as Dial number"
Treehugger Robot [Fri, 27 Jan 2017 21:30:42 +0000 (21:30 +0000)]
Merge "Handles #9 as Dial number"

7 years agoDO NOT MERGE - Fixed the logic for tethering provisioning re-evaluation
Jack Yu [Mon, 16 Jan 2017 18:49:55 +0000 (10:49 -0800)]
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

7 years agoMerge "Create a jank test to measure clipped ListView performance (part 2)"
TreeHugger Robot [Fri, 27 Jan 2017 21:19:15 +0000 (21:19 +0000)]
Merge "Create a jank test to measure clipped ListView performance (part 2)"

7 years agoCreate a jank test to measure clipped ListView performance (part 2)
Stan Iliev [Thu, 26 Jan 2017 18:26:08 +0000 (13:26 -0500)]
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

7 years agoMerge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev...
Jack Yu [Fri, 27 Jan 2017 21:12:09 +0000 (21:12 +0000)]
Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev am: d9ab9df05b
am: b38770b58e  -s ours

Change-Id: Ib90a249d6227a4cccf895cb27235382e700fede9

7 years agoFixed the logic for tethering provisioning re-evaluation am: 3294256ba5 -s ours
Jack Yu [Fri, 27 Jan 2017 21:10:55 +0000 (21:10 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 3294256ba5  -s ours
am: df4a6bc4de  -s ours

Change-Id: Ic90fc3e0e41820ea2178dd70ae60fee56f2980f4

7 years agoAdds @hide ImsResolver API and device overlays (2/3)
Brad Ebinger [Tue, 24 Jan 2017 00:20:33 +0000 (16:20 -0800)]
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

7 years agoMerge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev
Jack Yu [Fri, 27 Jan 2017 21:07:09 +0000 (21:07 +0000)]
Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev
am: d9ab9df05b

Change-Id: I282418ddb3043e12c48edf23933d1bea4c35c3e0

7 years agoFixed the logic for tethering provisioning re-evaluation
Jack Yu [Fri, 27 Jan 2017 21:07:00 +0000 (21:07 +0000)]
Fixed the logic for tethering provisioning re-evaluation
am: 3294256ba5  -s ours

Change-Id: I153971fb47656ac122f786ed2f86f6302abe48e7

7 years agoMerge "Introduced UserDataPreparer class"
TreeHugger Robot [Fri, 27 Jan 2017 20:57:30 +0000 (20:57 +0000)]
Merge "Introduced UserDataPreparer class"

7 years agoMerge "Merge "Use the new radio_metadata wrapper for safer memory management." am...
Android Build Merger (Role) [Fri, 27 Jan 2017 20:51:31 +0000 (20:51 +0000)]
Merge "Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b am: e163e7b943 am: bb15b50ffc am: aa70426388"

7 years agoMerge "SysUI: Fix race condition that is causing test failure"
TreeHugger Robot [Fri, 27 Jan 2017 20:50:33 +0000 (20:50 +0000)]
Merge "SysUI: Fix race condition that is causing test failure"

7 years agoMerge "AOD: Fix DirectReply"
Adrian Roos [Fri, 27 Jan 2017 20:50:00 +0000 (20:50 +0000)]
Merge "AOD: Fix DirectReply"

7 years agoMerge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8...
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:49:44 +0000 (20:49 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b am: e163e7b943 am: bb15b50ffc
am: aa70426388

Change-Id: I53b501fe3460165cbb5dd65b7d4427ca17b2e412

7 years agoTest passing null cert/keys to WifiEnterpriseConfig
Paul Stewart [Fri, 27 Jan 2017 20:03:47 +0000 (12:03 -0800)]
Test passing null cert/keys to WifiEnterpriseConfig

Ensure that null certificates and keys don't crash.

Bug: 34765004
Test: This is a test
Change-Id: I439b4f985c1b88ad4a9b58ee6f4eb4f90bd81246

7 years agoAccount for null client certificate
Paul Stewart [Fri, 27 Jan 2017 17:37:17 +0000 (09:37 -0800)]
Account for null client certificate

If a null certificate is passed to setClientKeyEntry() we should
not pass a non-null array with a single null element to the
setClientKeyEntryWithCertificateChain helper method.  Instead we
should pass a null array.

Cherry-pick of 410a3498ac28dccf69212d94a533040893c7ce0c

Bug: 34765004
Test: cts-tradefed run cts -d --module CtsNetTestCases --test android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I02793b4b29bc7325f98833c58bf652ba68353827

7 years agoMerge "Rename metrics_constants.proto DEFAULT_AUTOFILL_PICKER."
Jason Long [Fri, 27 Jan 2017 20:47:17 +0000 (20:47 +0000)]
Merge "Rename metrics_constants.proto DEFAULT_AUTOFILL_PICKER."

7 years agoMerge "Account for null client certificate"
TreeHugger Robot [Fri, 27 Jan 2017 20:46:15 +0000 (20:46 +0000)]
Merge "Account for null client certificate"

7 years agoMerge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8...
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:43:24 +0000 (20:43 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b am: e163e7b943
am: bb15b50ffc

Change-Id: I09c0c21f69efb739d73f247e76c3b378a0e5c7d6

7 years agoMerge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:38:55 +0000 (20:38 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b
am: e163e7b943

Change-Id: I61a101f50ef6ea56b0ed9b9b1b7ec4b0516220ab

7 years agoMerge "Convert native changing config flags to Java flags"
TreeHugger Robot [Fri, 27 Jan 2017 20:38:36 +0000 (20:38 +0000)]
Merge "Convert native changing config flags to Java flags"

7 years agoMerge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev
TreeHugger Robot [Fri, 27 Jan 2017 20:36:29 +0000 (20:36 +0000)]
Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev

7 years agoMerge "Moved LinkTextView to settingslib"
TreeHugger Robot [Fri, 27 Jan 2017 20:35:29 +0000 (20:35 +0000)]
Merge "Moved LinkTextView to settingslib"

7 years agoMerge "Use the new radio_metadata wrapper for safer memory management."
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:32:52 +0000 (20:32 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management."
am: a9ed0b1c8b

Change-Id: I7f5391cced1db62be2d9b88823d88d2d77f8b065

7 years agoMerge "Use the new radio_metadata wrapper for safer memory management."
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:26:06 +0000 (20:26 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management."

7 years agoMerge "Notification: Fix Ambient view text color"
TreeHugger Robot [Fri, 27 Jan 2017 20:17:24 +0000 (20:17 +0000)]
Merge "Notification: Fix Ambient view text color"

7 years agoMerge "Fix broken lock screen affordances"
TreeHugger Robot [Fri, 27 Jan 2017 20:17:10 +0000 (20:17 +0000)]
Merge "Fix broken lock screen affordances"

7 years agoImplement .xml font resource support
Clara Bayarri [Fri, 20 Jan 2017 14:58:21 +0000 (14:58 +0000)]
Implement .xml font resource support

This change implements the loading and parsing
of xml type font resources, and makes sure it is
used properly by TextView styles.

Test: run cts -m CtsContentTestCases -t android.content.res.cts.ResourcesTest
run cts -m CtsWidgetTestCases -t android.widget.cts.TextViewTest#testFontResources*

Change-Id: I5a2930b3ba7dad67d9607e9036a5dde6bab0c5a4

7 years agoMerge "OMS: introduce the OverlayManagerService"
TreeHugger Robot [Fri, 27 Jan 2017 19:42:56 +0000 (19:42 +0000)]
Merge "OMS: introduce the OverlayManagerService"

7 years agoMerge "Merge "Switch to listening for all network changes." am: 085ffa76fa am: 46f8ab...
Android Build Merger (Role) [Fri, 27 Jan 2017 19:40:44 +0000 (19:40 +0000)]
Merge "Merge "Switch to listening for all network changes." am: 085ffa76fa am: 46f8abd229 am: 118c0c9e7d am: 8aba32468a"

7 years agoMerge "Switch to listening for all network changes." am: 085ffa76fa am: 46f8abd229...
Erik Kline [Fri, 27 Jan 2017 19:39:31 +0000 (19:39 +0000)]
Merge "Switch to listening for all network changes." am: 085ffa76fa am: 46f8abd229 am: 118c0c9e7d
am: 8aba32468a

Change-Id: I00951c996b04124f3d8fba83802e3610e7b0e6e3

7 years agoMerge "Add tooltip for the search button in SearchView"
TreeHugger Robot [Fri, 27 Jan 2017 19:39:14 +0000 (19:39 +0000)]
Merge "Add tooltip for the search button in SearchView"

7 years agoMerge "Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling...
Android Build Merger (Role) [Fri, 27 Jan 2017 19:39:09 +0000 (19:39 +0000)]
Merge "Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b am: b0f03a64ea am: 221e58fe95  -s ours am: 83b3c5994e"

7 years agoMerge "Adds @hide ImsResolver API and device overlays (2/3)"
Brad Ebinger [Fri, 27 Jan 2017 19:38:46 +0000 (19:38 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)"