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

Clara Bayarri [Fri, 26 May 2017 12:09:56 +0000 (13:09 +0100)]

Expose hidden apis used by CTS as TestApi

Bug: 62066271
Test: See topic
Change-Id: I746189fe18ee465d7ada2de59e77a13566b9941f

commit | commitdiff | tree

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

Merge "wifi: override equals method for WifiSsid"

commit | commitdiff | tree

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

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

Change-Id: If83f2175a06961cbe30ab1dfe9b849752ba882f3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 May 2017 17:32:23 +0000 (17:32 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 17:31:05 +0000 (17:31 +0000)]

Merge "Add Keyguard bottom area overlay."

commit | commitdiff | tree

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

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

Change-Id: I6a765657f600b3d13028c26ba8c9726265721b59

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 17:02:34 +0000 (17:02 +0000)]

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

Change-Id: I7b21decefdea2bc52a6b9c1283d0189724091488

commit | commitdiff | tree

Dmitri Plotnikov [Thu, 25 May 2017 17:00:23 +0000 (17:00 +0000)]

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

Change-Id: I9796f43fc6dd78f40883c154f0e77f5b438e6bd8

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

Steven Moreland [Thu, 25 May 2017 16:52:50 +0000 (16:52 +0000)]

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

Change-Id: I5f678c629e73d4ed281990a620e2c92464d79259

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

TreeHugger Robot [Thu, 25 May 2017 16:44:36 +0000 (16:44 +0000)]

Merge "Fix warnings surfaced by error-prone."

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

Philip Quinn [Thu, 25 May 2017 16:18:52 +0000 (16:18 +0000)]

Merge "Add metrics constants for the assist gesture."

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 15:59:49 +0000 (15:59 +0000)]

Merge "[AWARE] Clarify semantics of service discovery parameters"

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 14:49:21 +0000 (14:49 +0000)]

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

Change-Id: I0f8fd515e4cb17fd8c58c70807c75a51542c8e87

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:08:04 +0000 (11:08 +0000)]

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

Change-Id: I444faff9c0f779f4c4e99949efb393d0cad66913

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:22:58 +0000 (09:22 +0000)]

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

Change-Id: If3bc370e618ebbda7ec21b26c2701f65e8935914

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:41:34 +0000 (04:41 +0000)]

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

Change-Id: Iadbfa00e79d3607fe64186991f008a55ac5b05f3

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:43:24 +0000 (03:43 +0000)]

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

Change-Id: I80fa9f2dd7cb5d0574aa8f47e2182439177f03c3

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

Selim Cinek [Thu, 25 May 2017 03:27:42 +0000 (03:27 +0000)]

Merge "Fixed an issue where groups could stay userlocked"

commit | commitdiff | tree

Kevin Chyn [Thu, 25 May 2017 03:16:10 +0000 (03:16 +0000)]

Merge "enable FP auth when assistant is showing and device is locked"

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:18:45 +0000 (01:18 +0000)]

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

Change-Id: I11af75ab8ebc4081cc90d29b83d8a1742f00a3ab

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

Kevin Chyn [Fri, 28 Apr 2017 19:18:19 +0000 (12:18 -0700)]

enable FP auth when assistant is showing and device is locked

Bug: 37875884
Test: manual
Change-Id: I4f310f71a50187735c1430b462291b2f57f54324

commit | commitdiff | tree

Joel Scherpelz [Thu, 25 May 2017 00:32:08 +0000 (00:32 +0000)]

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

Change-Id: I4669b0502a2da05fc7d6d23dda0fe57a69a412d6

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 00:22:33 +0000 (00:22 +0000)]

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

Change-Id: I60f2b830c7e93af0d6df148812d7e88309843560

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

Matthew Ng [Wed, 24 May 2017 23:59:36 +0000 (23:59 +0000)]

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

Change-Id: Ibe6c44350582db4e777ef1af44577d6c6dc91a9d

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

Tyler Gunn [Wed, 24 May 2017 23:09:07 +0000 (23:09 +0000)]

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

Change-Id: Ib1a0fa4221890b02937bc44d3293a65b5508d12f

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

Jason Monk [Wed, 24 May 2017 22:20:54 +0000 (22:20 +0000)]

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

Change-Id: I21ebacf2a8ae985514763198fd5a01f038790be7

commit | commitdiff | tree

Adrian Roos [Wed, 24 May 2017 22:18:43 +0000 (22:18 +0000)]

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

Change-Id: I93ab6feaf0b4fd36fa80fdc48878a5c71df70e26

commit | commitdiff | tree

Nathan Harold [Wed, 24 May 2017 22:09:57 +0000 (22:09 +0000)]

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

Change-Id: I5cb366480533afdb767144d760198d8ddfaa3dbd

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

Michael Schwartz [Wed, 24 May 2017 21:58:44 +0000 (21:58 +0000)]

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

Change-Id: Id4c700d6d5daf0ae08369b4c7263b7112dc3b609

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

Felipe Leme [Wed, 24 May 2017 21:53:58 +0000 (21:53 +0000)]

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

Change-Id: I36b5fcffeb58e83236553137f92bcc64104c0381

commit | commitdiff | tree

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

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

Change-Id: I8515f878b22a27a1b7c5f2c0eee5ee215e19bf0d

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

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

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

Change-Id: I1f659529a22072d329af949bedb3636400f0fde3

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

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

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

Change-Id: I8821126025eebc553d82c80018a8d2aefe57bf57

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

Adrian Roos [Wed, 24 May 2017 21:15:16 +0000 (21:15 +0000)]

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

Change-Id: I2f479aaf3ff68c797469ad3a35a9c4c6f09542ca

commit | commitdiff | tree

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

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

Change-Id: Iaa46cc13a0196168581103d80dc804cbeb40310c

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

Abodunrinwa Toki [Wed, 24 May 2017 21:11:02 +0000 (21:11 +0000)]

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

Change-Id: I811f5ce2af5f61b8be8dfbe5a875ec82e2adc3dc

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

Selim Cinek [Wed, 24 May 2017 21:04:38 +0000 (21:04 +0000)]

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

Change-Id: Ibd37dee4154d9a478de8c0c6ee9907c2b64fc9c9

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

Todd Kennedy [Wed, 24 May 2017 21:01:01 +0000 (21:01 +0000)]

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

Change-Id: I2a66bfa001ea03205535bc0337f720d869fa9132