git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Tyler Gunn [Thu, 25 May 2017 19:44:32 +0000 (19:44 +0000)]

Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev
am: 95f4f14e0b

Change-Id: If762616920b266064cd1ee5520d5778ebb1475a7

commit | commitdiff | tree

Tyler Gunn [Thu, 25 May 2017 19:33:58 +0000 (19:33 +0000)]

Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev

commit | commitdiff | tree

Sudheer Shanka [Thu, 25 May 2017 19:26:58 +0000 (19:26 +0000)]

Merge "[PackageManagerService]:Fix system app can't uninstall apps silently" into oc-dev
am: 975ee1f25a

Change-Id: I2872b5a97aa8912655505d0c180f70706002d10e

commit | commitdiff | tree

Sudheer Shanka [Thu, 25 May 2017 19:17:44 +0000 (19:17 +0000)]

Merge "[PackageManagerService]:Fix system app can't uninstall apps silently" into oc-dev

commit | commitdiff | tree

Tony Mak [Thu, 25 May 2017 19:09:24 +0000 (19:09 +0000)]

Merge "Fix permission is not granted to work profile system app by default" into oc-dev
am: 0995b177ab

Change-Id: I0fa9263de3416837f361247ddd95b69cc70b1575

commit | commitdiff | tree

Julia Reynolds [Thu, 25 May 2017 19:03:53 +0000 (19:03 +0000)]

Merge "Fix backup and restore of package blocks" into oc-dev
am: 2686322e71

Change-Id: Ic6d42f58038d7a4feead2f5a3c2c03f11f71e79e

commit | commitdiff | tree

John Reck [Thu, 25 May 2017 19:01:10 +0000 (19:01 +0000)]

Merge "Creating HW bitmaps from RenderNode" into oc-dev
am: d63b77c627

Change-Id: Ia95a9f190c36999f70fdadbe45e1774beab80988

commit | commitdiff | tree

Tony Mak [Thu, 25 May 2017 18:57:32 +0000 (18:57 +0000)]

Merge "Fix permission is not granted to work profile system app by default" into oc-dev

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 18:54:14 +0000 (18:54 +0000)]

Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev
am: c8124cb94c

Change-Id: I10f0767e85c25e6257ab2d4f02e5a7d8a0ef6fac

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 18:48:56 +0000 (18:48 +0000)]

Merge "Fix backup and restore of package blocks" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 18:48:18 +0000 (18:48 +0000)]

Merge "Creating HW bitmaps from RenderNode" into oc-dev

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 18:39:09 +0000 (18:39 +0000)]

Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev

commit | commitdiff | tree

Erik Wolsheimer [Thu, 25 May 2017 18:22:57 +0000 (18:22 +0000)]

Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev
am: 4c6a49ed47

Change-Id: Ib92f2dbad240bae9f46a23aa61eb2b7d09a96896

commit | commitdiff | tree

Makoto Onuki [Thu, 25 May 2017 18:19:18 +0000 (18:19 +0000)]

Merge "Working around bugreport crash issues" into oc-dev
am: 5176a4cda3

Change-Id: Id5f50a4fad73b51079685b86839ccbe9912c2148

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 18:10:22 +0000 (18:10 +0000)]

Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 18:07:23 +0000 (18:07 +0000)]

Merge "Working around bugreport crash issues" into oc-dev

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 25 May 2017 17:25:34 +0000 (17:25 +0000)]

Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev
am: 906948e7e2

Change-Id: I0007db72b0ca923c0e42bbb6ddadf34e927b5612

commit | commitdiff | tree

Jason Monk [Thu, 25 May 2017 17:19:48 +0000 (17:19 +0000)]

Merge "Fix guest tint" into oc-dev
am: 70d4423eb6

Change-Id: I65d05cbf2b3cc31e5fb2376eb3ab9a0782cc0c9d

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 25 May 2017 17:11:00 +0000 (17:11 +0000)]

Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev

commit | commitdiff | tree

Jason Monk [Thu, 25 May 2017 17:09:09 +0000 (17:09 +0000)]

Merge "Fix guest tint" into oc-dev

commit | commitdiff | tree

Jorim Jaggi [Thu, 25 May 2017 16:53:34 +0000 (16:53 +0000)]

Merge "Fix flaky tests" into oc-dev
am: b80cffad4b

Change-Id: Ia78dac2c9333a89f48a998b8df9b0f12e78da71c

commit | commitdiff | tree

Dmitri Plotnikov [Thu, 25 May 2017 16:51:17 +0000 (16:51 +0000)]

Merge "Triggering quiescent reboot during OTA" into oc-dev
am: d9417c53e0

Change-Id: I0b2b42d95d739701a367bd5d25bebbd64d033ad0

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 16:47:08 +0000 (16:47 +0000)]

Merge "Fix flaky tests" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 16:46:32 +0000 (16:46 +0000)]

Merge "Triggering quiescent reboot during OTA" into oc-dev

commit | commitdiff | tree

Steven Moreland [Thu, 25 May 2017 16:45:48 +0000 (16:45 +0000)]

Merge "HIDL: C++ Java parity" am: 475d9b283c am: 101aa88ad6
am: 5b33f9b441

Change-Id: I7a7ae9d03ad51248526f3e93884e99bf7bc9e0b5

commit | commitdiff | tree

Steven Moreland [Thu, 25 May 2017 16:39:40 +0000 (16:39 +0000)]

Merge "HIDL: C++ Java parity" am: 475d9b283c
am: 101aa88ad6

Change-Id: If341009ba5c22ec0e83170e856e83b23d8a925ce

commit | commitdiff | tree

Steven Moreland [Thu, 25 May 2017 16:34:21 +0000 (16:34 +0000)]

Merge "HIDL: C++ Java parity"
am: 475d9b283c

Change-Id: I8195a0a4de291f26c637f5cd6802d6bbaf0d17a3

commit | commitdiff | tree

Treehugger Robot [Thu, 25 May 2017 16:28:41 +0000 (16:28 +0000)]

Merge "HIDL: C++ Java parity"

commit | commitdiff | tree

Julia Reynolds [Mon, 22 May 2017 12:45:27 +0000 (08:45 -0400)]

Fix backup and restore of package blocks

-Restore block status for apps that already exist
E.g. apps on the system image
- Stop depending on appops, it's duplicative and
not backuped/restored

Fixes: 38340377
Test: runtest systemui-notification, toast and notification
cts tests, backup android, clear data on packages, restore android,
verify that blocked apps stay blocked.
Change-Id: I29a33d7db2701bd64a7b30411dcf77c0a2f321d1

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 14:38:10 +0000 (14:38 +0000)]

Merge "Autofill UI should still show when dataset authentication is cancelled." into oc-dev
am: c368c0b5ab

Change-Id: I3fe0b21fc76ae8c0edf8c3a742fa4bdbd0173fb2

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 14:32:04 +0000 (14:32 +0000)]

Merge "Autofill UI should still show when dataset authentication is cancelled." into oc-dev

commit | commitdiff | tree

Neil Fuller [Thu, 25 May 2017 11:01:07 +0000 (11:01 +0000)]

Merge "Remove time_zones_by_country.xml file" am: 3436fd4833 am: 1541ef3712
am: 4e9c135a5a

Change-Id: I8d03ce9616c702d73fb6a807d45c58afd332b50b

commit | commitdiff | tree

Neil Fuller [Thu, 25 May 2017 10:54:07 +0000 (10:54 +0000)]

Merge "Remove time_zones_by_country.xml file" am: 3436fd4833
am: 1541ef3712

Change-Id: Iba095c44c332658f7eea448dcf653b46bce5d8e8

commit | commitdiff | tree

Neil Fuller [Thu, 25 May 2017 10:46:41 +0000 (10:46 +0000)]

Merge "Remove time_zones_by_country.xml file"
am: 3436fd4833

Change-Id: I75cf86290b0dcc5aa99b9d0ebacbc5aa07269aab

commit | commitdiff | tree

Neil Fuller [Thu, 25 May 2017 10:39:14 +0000 (10:39 +0000)]

Merge "Remove time_zones_by_country.xml file"

commit | commitdiff | tree

Erik Kline [Thu, 25 May 2017 09:14:17 +0000 (09:14 +0000)]

Merge "Expand logging capabilities of Tethering subsystem" into oc-dev
am: fc6e6d1372 -s ours

Change-Id: I44c8ac70d0d3c53e52807697e62c40474d5fa356

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 09:04:33 +0000 (09:04 +0000)]

Merge "Expand logging capabilities of Tethering subsystem" into oc-dev

commit | commitdiff | tree

Kevin Chyn [Thu, 25 May 2017 04:33:07 +0000 (04:33 +0000)]

Merge "Revert fix for FingerprintManager leak" into oc-dev
am: 807a8c6e7c

Change-Id: I9f9132b1785c4e7c7d04dcc7decfbc4e447fbdd0

commit | commitdiff | tree

Kevin Chyn [Thu, 25 May 2017 04:28:09 +0000 (04:28 +0000)]

Merge "Revert fix for FingerprintManager leak" into oc-dev

commit | commitdiff | tree

Selim Cinek [Thu, 25 May 2017 03:38:01 +0000 (03:38 +0000)]

Merge "Fixed an issue where groups could stay userlocked" into oc-dev
am: e736807efd

Change-Id: I8d2bdf59d406985ac336eddcf8f868a985f30612

commit | commitdiff | tree

Selim Cinek [Thu, 25 May 2017 03:29:10 +0000 (03:29 +0000)]

Merge "Fixed an issue where groups could stay userlocked" into oc-dev

commit | commitdiff | tree

Dmitri Plotnikov [Wed, 10 May 2017 23:26:38 +0000 (16:26 -0700)]

Triggering quiescent reboot during OTA

Bug: 34201965
Test: follow instructions in https://docs.google.com/document/d/1RjvUGRi_Ys5-BRoJz6_SnixuipFiF-GAs6CNc7w-Qj0/edit and use fake-ota
Change-Id: I540f86cf11746faefc25bc74319512eba6d0d783

commit | commitdiff | tree

Hugo Benichi [Thu, 25 May 2017 01:12:51 +0000 (01:12 +0000)]

Merge "NsdServiceInfo: move test to tests/net" am: 48859e01d5 am: 1b0f4bf606
am: e8c2700519

Change-Id: I44cae417fcddad72c13938b6fb751de6ed784046

commit | commitdiff | tree

Hugo Benichi [Thu, 25 May 2017 01:06:48 +0000 (01:06 +0000)]

Merge "NsdServiceInfo: move test to tests/net" am: 48859e01d5
am: 1b0f4bf606

Change-Id: I2c27790f23d1ecc7b42dbbe28313f0533a1bab53

commit | commitdiff | tree

Hugo Benichi [Thu, 25 May 2017 01:01:15 +0000 (01:01 +0000)]

Merge "NsdServiceInfo: move test to tests/net"
am: 48859e01d5

Change-Id: I3e864d744b956eff62512419018dd7cd5f692333

commit | commitdiff | tree

Hugo Benichi [Thu, 25 May 2017 00:50:24 +0000 (00:50 +0000)]

Merge "NsdServiceInfo: move test to tests/net"

commit | commitdiff | tree

Makoto Onuki [Wed, 24 May 2017 21:58:25 +0000 (14:58 -0700)]

Working around bugreport crash issues

Overall we need more synchronization, but I'm taking a safe approach
here for oc-dev for now.

Bug: 62043115
Test: adb shell am instrument -w com.android.shell.tests
Change-Id: I0e22c5160cb96ce51dc1775237f01b7bf5c97a17

commit | commitdiff | tree

Joel Scherpelz [Thu, 25 May 2017 00:18:44 +0000 (00:18 +0000)]

Merge "Ignore flow label when comparing RAs in APF" am: 81fda77884 am: 6ccdb3fe19
am: ef0bd781b1

Change-Id: I53c2a493946ecc4e5617bcd3f5e64ff0b82fedf2

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 00:13:10 +0000 (00:13 +0000)]

Merge "Don't WTF when assist structure is missing." into oc-dev
am: 9fe48b43ba

Change-Id: Ibe8fccf20f17327ce86635762accd87f4ccc8b08

commit | commitdiff | tree

Joel Scherpelz [Thu, 25 May 2017 00:12:22 +0000 (00:12 +0000)]

Merge "Ignore flow label when comparing RAs in APF" am: 81fda77884
am: 6ccdb3fe19

Change-Id: I8a463109f896fe91f391c26f4b341e0e0c417d8a

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 00:05:49 +0000 (00:05 +0000)]

Merge "Don't WTF when assist structure is missing." into oc-dev

commit | commitdiff | tree

Joel Scherpelz [Thu, 25 May 2017 00:04:12 +0000 (00:04 +0000)]

Merge "Ignore flow label when comparing RAs in APF"
am: 81fda77884

Change-Id: Id1a51e03e5065cabb4645d1e05f5e22ab4e98c0a

commit | commitdiff | tree

Kevin Chyn [Wed, 24 May 2017 23:56:56 +0000 (16:56 -0700)]

Revert fix for FingerprintManager leak

Bug: 38509779
Bug: 32295793

Setting to null causes problem seen in b/38509779
Using weakreference will cause problems if the application
declares AuthenticationClient as a weak reference as well and would
very likely break a lot of existing apps.

Test: manual
Change-Id: Iedbdd76f3a402b766ce8a799bf76324d1164a0ec

commit | commitdiff | tree

Joel Scherpelz [Wed, 24 May 2017 23:54:21 +0000 (23:54 +0000)]

Merge "Ignore flow label when comparing RAs in APF"

commit | commitdiff | tree

Felipe Leme [Wed, 24 May 2017 20:16:31 +0000 (13:16 -0700)]

Autofill UI should still show when dataset authentication is cancelled.

Test: manual verification
Test: existing CtsAutoFillServiceTestCases pass
Test: LoginActivityTest.testDatasetAuthTwoFieldsUserCancelsFirstAttempt

Fixes: 38427468

Change-Id: If8785ad8fda1408a5dee66c53f7dcb4c85d78262

commit | commitdiff | tree

Matthew Ng [Wed, 24 May 2017 23:48:45 +0000 (23:48 +0000)]

Merge "Update the app window's thumbnail layer after starting window is removed" into oc-dev
am: 052ff89f65

Change-Id: I7a622e8e4fee766619828831315d11db1ace6ec9

commit | commitdiff | tree

TreeHugger Robot [Wed, 24 May 2017 23:44:10 +0000 (23:44 +0000)]

Merge "Update the app window's thumbnail layer after starting window is removed" into oc-dev

commit | commitdiff | tree

Andrew Solovay [Mon, 22 May 2017 22:36:11 +0000 (15:36 -0700)]

docs: Clarifying code snippet for View.autoFill()

Per bug, updating code snippet to clarify that it's an example of an
implementation of the method. Oscar & Felipe, please check that I did
it right!

Also fixed a couple of HTML syntax errors while I had the file open
(badly formatted escape-characters that Chrome figured out, but other
browsers might choke on) and a spelling error.

Revised Javadoc is staged to:

http://go/dac-stage/reference/android/view/View.html#autofill(android.view.autofill.AutofillValue)

Test: make ds-docs
Bug: 38347106
Change-Id: I587a66c53fd5ebeeb6108529723d2d7a74c61cf7

commit | commitdiff | tree

Tyler Gunn [Wed, 24 May 2017 23:01:22 +0000 (23:01 +0000)]

Merge "Add ability to dump events in a timeline view." am: 255a171c5d am: 3b27d69612
am: a1c225936a

Change-Id: I34c3327e675d1948ae6074337cce800919e03030

commit | commitdiff | tree

Tyler Gunn [Wed, 24 May 2017 22:52:40 +0000 (22:52 +0000)]

Merge "Add ability to dump events in a timeline view." am: 255a171c5d
am: 3b27d69612

Change-Id: I5363916199a33e795fcfb8497815687cda91f6ef

commit | commitdiff | tree

Tyler Gunn [Wed, 24 May 2017 22:45:55 +0000 (22:45 +0000)]

Merge "Add ability to dump events in a timeline view."
am: 255a171c5d

Change-Id: I7bb01946685f4e9c5b60fd0e8e2be4b071fd1a6f

commit | commitdiff | tree

Tyler Gunn [Wed, 24 May 2017 22:36:41 +0000 (22:36 +0000)]

Merge "Add ability to dump events in a timeline view."

commit | commitdiff | tree

Tyler Gunn [Tue, 9 May 2017 21:34:57 +0000 (14:34 -0700)]

Add ability to add existing connection AND set parent at the same time.

This is useful for IMS conferences where we want to add a connection and
set it as a child of a conference at the same time.

Test: Manual
Bug: 37581781
Change-Id: Id09c8296ffe18893c5642d403c6a69ad6c9765e2

commit | commitdiff | tree

John Reck [Tue, 23 May 2017 21:45:22 +0000 (14:45 -0700)]

Creating HW bitmaps from RenderNode

Allows creating a HW Bitmap from the drawing
commands of a RenderNode.

Bug: 38507414
Bug: 37698012
Test: Sample in HwAccelerationTest

Change-Id: I57c60b2c8bf5194f4412ad4b7f1c1f35e2e4c757

commit | commitdiff | tree

Jason Monk [Wed, 24 May 2017 22:05:29 +0000 (22:05 +0000)]

Merge "Fix QS tiles not rippling" into oc-dev
am: b8e5742f5b

Change-Id: I05ff98435f88ea489a557013fc53a8cfe12304f5

commit | commitdiff | tree

Adrian Roos [Wed, 24 May 2017 22:01:34 +0000 (22:01 +0000)]

Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev
am: 838e365581

Change-Id: I7140eb9253c84dc35a5f3bf62576e71e4828c6c5

commit | commitdiff | tree

Nathan Harold [Wed, 24 May 2017 21:56:36 +0000 (21:56 +0000)]

Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev
am: 72cdc9cdae

Change-Id: I7c6360ee53e929e0e03dcd1e1a767d98af94f620

commit | commitdiff | tree

Michael Schwartz [Wed, 24 May 2017 21:50:47 +0000 (21:50 +0000)]

Merge "Check VintfObject compatibility on boot" into oc-dev
am: 4e962321ad

Change-Id: Ie3f55facc983e421432549440a81c1978c3e9482

commit | commitdiff | tree

TreeHugger Robot [Wed, 24 May 2017 21:50:15 +0000 (21:50 +0000)]

Merge "Fix QS tiles not rippling" into oc-dev

commit | commitdiff | tree

Felipe Leme [Wed, 24 May 2017 21:46:30 +0000 (21:46 +0000)]

Merge "Fixed assertions on bugreport share notification." into oc-dev
am: 39b375c9db

Change-Id: I90ec303a24376b63b59dbc0035f56058c062a2af

commit | commitdiff | tree

Ruthwar Kumar Ambeer [Wed, 24 May 2017 21:39:44 +0000 (21:39 +0000)]

Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev
am: ef98275635 -s ours

Change-Id: Icf1ff0d9ed2ee86728960f3349762275020f8f10

commit | commitdiff | tree

TreeHugger Robot [Wed, 24 May 2017 21:36:32 +0000 (21:36 +0000)]

Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev

commit | commitdiff | tree

Nathan Harold [Wed, 24 May 2017 21:36:15 +0000 (21:36 +0000)]

Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev

commit | commitdiff | tree

Michael Schwartz [Wed, 24 May 2017 21:34:03 +0000 (21:34 +0000)]

Merge "Check VintfObject compatibility on boot" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 24 May 2017 21:32:56 +0000 (21:32 +0000)]

Merge "Fixed assertions on bugreport share notification." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 24 May 2017 21:28:05 +0000 (21:28 +0000)]

Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev

commit | commitdiff | tree

Tenghui Zhu [Wed, 24 May 2017 21:17:36 +0000 (21:17 +0000)]

Merge "Add documentation about 0 scale matrix to Shader" into oc-dev
am: 52ca75011b

Change-Id: Ied29af1118f1f5db343c3e3d7218d757b67f61a6

commit | commitdiff | tree

Sergey Vasilinets [Wed, 24 May 2017 21:12:12 +0000 (21:12 +0000)]

Merge "Correctly save retained fragments in the backstack" into oc-dev
am: ce8a4b89c8

Change-Id: I755b0f38c907d1ae7bf12df67f4b10590a9016bf

commit | commitdiff | tree

Tenghui Zhu [Wed, 24 May 2017 21:06:52 +0000 (21:06 +0000)]

Merge "Add documentation about 0 scale matrix to Shader" into oc-dev

commit | commitdiff | tree

Adrian Roos [Wed, 24 May 2017 21:05:57 +0000 (21:05 +0000)]

Merge "Keyguard: Update clock size" into oc-dev
am: 6441e1064c

Change-Id: I56dae82a5fdefcd088bb0b8ec8eb3cd8a89f7bf7

commit | commitdiff | tree

Sergey Vasilinets [Wed, 24 May 2017 21:05:34 +0000 (21:05 +0000)]

Merge "Correctly save retained fragments in the backstack" into oc-dev

commit | commitdiff | tree

Adrian Roos [Wed, 24 May 2017 21:01:46 +0000 (21:01 +0000)]

Merge "Keyguard: Remove all caps from keyguard status view" into oc-dev
am: 246a2c90ac

Change-Id: I36f60a7e64b38e7abdbb59b629997f4214db9b3f

commit | commitdiff | tree

Adrian Roos [Wed, 24 May 2017 21:01:39 +0000 (21:01 +0000)]

Merge "Keyguard: Update clock size" into oc-dev

commit | commitdiff | tree

Selim Cinek [Wed, 24 May 2017 18:08:55 +0000 (11:08 -0700)]

Fixed an issue where groups could stay userlocked

It also fixes an issue where the reinflation wasn't
working properly.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Merged-In: If359256a3ac0c574260b5ff5af3fc2042e1dce9a
Change-Id: If359256a3ac0c574260b5ff5af3fc2042e1dce9a
Fixes: 36469584

commit | commitdiff | tree

Abodunrinwa Toki [Wed, 24 May 2017 20:59:39 +0000 (20:59 +0000)]

Merge "Regression test: Menu item title updates." into oc-dev
am: 834f257f22

Change-Id: Ia2a226edb48340774a7d9c79b6a7f113241a3df0

commit | commitdiff | tree

Selim Cinek [Wed, 24 May 2017 20:52:13 +0000 (20:52 +0000)]

Merge "Fixed that pinned huns could become clipped" into oc-dev
am: 20e1c8c0f5

Change-Id: Ic4f94667f2349be270f5cfff50e77d66e9b8f4ce

commit | commitdiff | tree

TreeHugger Robot [Wed, 24 May 2017 20:50:57 +0000 (20:50 +0000)]

Merge "Keyguard: Remove all caps from keyguard status view" into oc-dev

commit | commitdiff | tree

Todd Kennedy [Wed, 24 May 2017 20:49:59 +0000 (20:49 +0000)]

Merge "System installed launcher can see instant apps" into oc-dev
am: 1de10d6602

Change-Id: I70d707c25ed793bd2ad8e58f3558d2a4d0b6e980

commit | commitdiff | tree

Abodunrinwa Toki [Wed, 24 May 2017 20:48:02 +0000 (20:48 +0000)]

Merge "Regression test: Menu item title updates." into oc-dev

commit | commitdiff | tree

Selim Cinek [Wed, 24 May 2017 20:44:56 +0000 (20:44 +0000)]

Merge "Fixed that pinned huns could become clipped" into oc-dev

commit | commitdiff | tree

Brad Ebinger [Wed, 24 May 2017 20:39:46 +0000 (20:39 +0000)]

Merge "Support RRO for emergency number conversion map" am: 671680e504 am: 8498a6cffd
am: ddd73513e6

Change-Id: Id41d327b54fdf95c86a4f6e8d3727b79b98a2d5b

commit | commitdiff | tree

TreeHugger Robot [Wed, 24 May 2017 20:38:51 +0000 (20:38 +0000)]

Merge "System installed launcher can see instant apps" into oc-dev

commit | commitdiff | tree

Brad Ebinger [Wed, 24 May 2017 20:33:26 +0000 (20:33 +0000)]

Merge "Support RRO for emergency number conversion map" am: 671680e504
am: 8498a6cffd

Change-Id: I4b90f44a5ccf42ab1586ae8867f63c0a2e362d97

commit | commitdiff | tree

Roshan Pius [Wed, 24 May 2017 20:31:21 +0000 (20:31 +0000)]

Merge "WifiMetrics: Add metrics for HAL/wificond crashes" into oc-dev
am: 131eaa7865

Change-Id: I954fd52c87f3b447469af898ca77dde2a4707346

commit | commitdiff | tree

Christopher Ferris [Wed, 24 May 2017 20:28:24 +0000 (20:28 +0000)]

Merge "Zygote: Allow arbitrary-length wrap property names" into oc-dev
am: 8e3b379394

Change-Id: I24f8e5f7f2259feb6564390f24303991f580a76d