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

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

Makoto Onuki [Tue, 27 Jun 2017 00:38:12 +0000 (00:38 +0000)]

Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev am: c4ccefc7fd
am: bb55e3e2e4

Change-Id: I98a0ff03f1de40e3092da47eaae2a3febfe1bd60

commit | commitdiff | tree

Makoto Onuki [Tue, 27 Jun 2017 00:36:56 +0000 (00:36 +0000)]

Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b am: 36520c229f" into oc-dr1-dev-plus-aosp
am: bd1d8bf4c2

Change-Id: I770e8c209a9885685c1415cbb4a3c6a2ccb37e44

commit | commitdiff | tree

Makoto Onuki [Tue, 27 Jun 2017 00:35:31 +0000 (00:35 +0000)]

Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b am: eb63919bc4
am: 9b723d886e

Change-Id: If824cafb12f37555fc433512d1fd02ab107f4355

commit | commitdiff | tree

Ying Xu [Tue, 27 Jun 2017 00:34:09 +0000 (00:34 +0000)]

Merge "Fix the inconsistency of scan status." into oc-dr1-dev am: 231e291b06 -s ours
am: cb758f46ba -s ours

Change-Id: I8237389f9e1bd2223f488ae642500bc664704c23

commit | commitdiff | tree

Sean Lu [Tue, 27 Jun 2017 00:33:00 +0000 (00:33 +0000)]

Merge "[Resources] house keeping in TypeList" am: ff2e03cfce am: 516bd5f862 am: 2d604852ce
am: 5386fcf965

Change-Id: Iafa12b6189d9b97354adcff2a481602db9522c48

commit | commitdiff | tree

Marco Nelissen [Tue, 27 Jun 2017 00:31:33 +0000 (00:31 +0000)]

Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev am: 59a66b8601
am: b0bb373286

Change-Id: I859b99e3dc68396abccc0f399004860042d6cb07

commit | commitdiff | tree

Evan Laird [Tue, 27 Jun 2017 00:30:10 +0000 (00:30 +0000)]

Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev am: be196018e1
am: fdef07d9fe

Change-Id: I8d8b1f126ed3a7690cc09d9fc38f12583210b407

commit | commitdiff | tree

Makoto Onuki [Mon, 26 Jun 2017 23:53:00 +0000 (23:53 +0000)]

Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev
am: c4ccefc7fd

Change-Id: I2701f1fc12d487d23200ef8e5509535656fe27fe

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 23:49:00 +0000 (23:49 +0000)]

Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 26 Jun 2017 23:37:58 +0000 (23:37 +0000)]

Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b am: 36520c229f" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Makoto Onuki [Mon, 26 Jun 2017 23:36:54 +0000 (23:36 +0000)]

Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b
am: 36520c229f

Change-Id: I1cea2e7016ec5a1bf3b3411d7cbb389db150aeef

commit | commitdiff | tree

Makoto Onuki [Mon, 26 Jun 2017 23:36:48 +0000 (23:36 +0000)]

Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b
am: eb63919bc4

Change-Id: Ie035bcafa71e4b8d2e2e839212b001dc4c1d00f7

commit | commitdiff | tree

Makoto Onuki [Mon, 26 Jun 2017 23:31:59 +0000 (23:31 +0000)]

Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am: 9f607f4c0b

Change-Id: Ie8b426c14fa30b7c2f5eadc5818e1dfd16f8c0a5

commit | commitdiff | tree

Makoto Onuki [Mon, 26 Jun 2017 23:31:56 +0000 (23:31 +0000)]

Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am: 9f607f4c0b

Change-Id: Iddf617784c20bfd835413e934071aea3b02d5d6c

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 23:25:10 +0000 (23:25 +0000)]

Merge "Fix activity icon badging for non-bitmap icons" into oc-dev

commit | commitdiff | tree

Ying Xu [Mon, 26 Jun 2017 23:15:58 +0000 (23:15 +0000)]

Merge "Fix the inconsistency of scan status." into oc-dr1-dev
am: 231e291b06 -s ours

Change-Id: I5faaa2f7589ceaa68bf7ae21c065e2dce0621286

commit | commitdiff | tree

Ying Xu [Mon, 26 Jun 2017 23:09:55 +0000 (23:09 +0000)]

Merge "Fix the inconsistency of scan status." into oc-dr1-dev

commit | commitdiff | tree

Sean Lu [Mon, 26 Jun 2017 23:09:29 +0000 (23:09 +0000)]

Merge "[Resources] house keeping in TypeList" am: ff2e03cfce am: 516bd5f862
am: 2d604852ce

Change-Id: I983ab5312b484a8d3f8adafd693f2435c460ab5a

commit | commitdiff | tree

Sean Lu [Mon, 26 Jun 2017 23:04:56 +0000 (23:04 +0000)]

Merge "[Resources] house keeping in TypeList" am: ff2e03cfce
am: 516bd5f862

Change-Id: I8334cb07c4cc3479e91381cb7d6be3a08b746070

commit | commitdiff | tree

Sean Lu [Mon, 26 Jun 2017 22:59:35 +0000 (22:59 +0000)]

Merge "[Resources] house keeping in TypeList"
am: ff2e03cfce

Change-Id: I22b0a87776d794f23f70f2f9d8d885761c0b8d14

commit | commitdiff | tree

Marco Nelissen [Mon, 26 Jun 2017 22:53:04 +0000 (22:53 +0000)]

Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev
am: 59a66b8601

Change-Id: I1e8e369079b649890e3313ef406c97f3ea86c0f0

commit | commitdiff | tree

Treehugger Robot [Mon, 26 Jun 2017 22:50:23 +0000 (22:50 +0000)]

Merge "[Resources] house keeping in TypeList"

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 22:48:00 +0000 (22:48 +0000)]

Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 22:26:09 +0000 (22:26 +0000)]

Merge "Implement key/value quota-overrun detection in LocalTransport"

commit | commitdiff | tree

Evan Laird [Mon, 26 Jun 2017 22:16:54 +0000 (22:16 +0000)]

Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev
am: be196018e1

Change-Id: Ib7f8e5e65b353bf03affc557e38d7c4ecd47d0a8

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 21:48:58 +0000 (21:48 +0000)]

Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev

commit | commitdiff | tree

Bryce Lee [Mon, 26 Jun 2017 21:26:54 +0000 (21:26 +0000)]

Merge "Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f" into oc-dr1-dev am: 5345fce58f" into oc-dr1-dev-plus-aosp
am: 519ce1487c

Change-Id: I46846b894e332431cf793657cad4903bfadd418f

commit | commitdiff | tree

Makoto Onuki [Mon, 26 Jun 2017 21:25:30 +0000 (21:25 +0000)]

Merge "Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev am: c4e8720eb2" into oc-dr1-dev-plus-aosp
am: 54805b7467

Change-Id: I8e6c29906a3d5f8814a89ad419146e5b8eff9e4c

commit | commitdiff | tree

Bryce Lee [Mon, 26 Jun 2017 21:24:02 +0000 (21:24 +0000)]

Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f am: 4e9f527d17
am: 1ffc7ca2d7

Change-Id: I5fcc8de81415a72b1733892b37712b1fe1ea287f

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 26 Jun 2017 21:18:23 +0000 (21:18 +0000)]

Merge "Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f" into oc-dr1-dev am: 5345fce58f" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bryce Lee [Mon, 26 Jun 2017 21:17:29 +0000 (21:17 +0000)]

Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f" into oc-dr1-dev
am: 5345fce58f

Change-Id: I3b70dbc2fcdac06b83948fc7dfed82a5872028d7

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 26 Jun 2017 21:16:49 +0000 (21:16 +0000)]

Merge "Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev am: c4e8720eb2" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Makoto Onuki [Mon, 26 Jun 2017 21:15:26 +0000 (21:15 +0000)]

Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev
am: c4e8720eb2

Change-Id: Ib24297e8ca16f1f9db5f6951438f4f7006e545c7

commit | commitdiff | tree

Bryce Lee [Mon, 26 Jun 2017 21:15:25 +0000 (21:15 +0000)]

Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f
am: 4e9f527d17

Change-Id: I891215b6bd198ded78af491e9a69e71ffbb5d805

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 21:07:28 +0000 (21:07 +0000)]

Merge "Fix metrics constant typo"

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 26 Jun 2017 20:59:50 +0000 (20:59 +0000)]

Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f" into oc-dr1-dev

commit | commitdiff | tree

Bryce Lee [Mon, 26 Jun 2017 20:59:00 +0000 (20:59 +0000)]

Merge "Revert "Add ActivityInfo logging."" into oc-dev
am: 61196fef1f

Change-Id: I7f11b4a66def7cb49ba20a4ab4772eea0a25ef16

commit | commitdiff | tree

Bryce Lee [Mon, 26 Jun 2017 20:58:56 +0000 (20:58 +0000)]

Merge "Revert "Add ActivityInfo logging."" into oc-dev
am: 61196fef1f

Change-Id: I1ead0fd55eb35fd69a4c8e3de5a1449ce296edd9

commit | commitdiff | tree

Tomasz Wasilczyk [Mon, 26 Jun 2017 20:58:41 +0000 (20:58 +0000)]

Merge "Remove previous implementation of RadioService."

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 20:58:23 +0000 (20:58 +0000)]

Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev

commit | commitdiff | tree

Bryce Lee [Mon, 26 Jun 2017 20:50:00 +0000 (20:50 +0000)]

Merge "Revert "Add ActivityInfo logging."" into oc-dev

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 20:43:02 +0000 (20:43 +0000)]

Merge "Merge "Filter instant apps with different names" into oc-dev am: adcc94f160 am: a350db60bd" into oc-dr1-dev-plus-aosp
am: fdacdca831

Change-Id: I23097276d01509f42b71e9a7dcc1e66d33a4f5ab

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 20:41:29 +0000 (20:41 +0000)]

Merge "Merge "Filter instant apps with different names" into oc-dev am: adcc94f160 am: ae524ac5fa" into oc-dr1-dev-plus-aosp
am: 193a4f12c5

Change-Id: I4f8fe31455f5946477d8a793843e70d0f88d17eb

commit | commitdiff | tree

Jason Monk [Mon, 26 Jun 2017 20:39:55 +0000 (20:39 +0000)]

Merge "Merge "Fix QS lock screen animation" into oc-dev am: aa2286e417 am: a86cc7098a" into oc-dr1-dev-plus-aosp
am: 29532b40c7

Change-Id: I36db47a9d2b3c7924e80eb980f2eaa6a33ecfd46

commit | commitdiff | tree

Jason Monk [Mon, 26 Jun 2017 20:38:29 +0000 (20:38 +0000)]

Merge "Fix QS lock screen animation" into oc-dev am: aa2286e417 am: be163c055e
am: d7464478ee

Change-Id: I7383890619c9696de358efd4099c7af5b223a5f3

commit | commitdiff | tree

Christopher Tate [Fri, 23 Jun 2017 19:48:26 +0000 (12:48 -0700)]

Implement key/value quota-overrun detection in LocalTransport

We now preflight the effect of a k/v backup delta set against the
current contents of the datastore, so we can detect and report a
quota overrun nondestructively.

Test: bit CtsBackupTestCases:.KeyValueQuotaTest
Change-Id: If69687b891271d7bbb46c3a66728b716dc51fc39

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 26 Jun 2017 20:26:51 +0000 (20:26 +0000)]

Merge "Merge "Filter instant apps with different names" into oc-dev am: adcc94f160 am: a350db60bd" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 26 Jun 2017 20:26:32 +0000 (20:26 +0000)]

Merge "Merge "Filter instant apps with different names" into oc-dev am: adcc94f160 am: ae524ac5fa" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 20:25:53 +0000 (20:25 +0000)]

Merge "Filter instant apps with different names" into oc-dev am: adcc94f160
am: a350db60bd

Change-Id: Ic1ee7426adb727cbe9ea208a367e57f8d1ed3514

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 20:25:35 +0000 (20:25 +0000)]

Merge "Filter instant apps with different names" into oc-dev am: adcc94f160
am: ae524ac5fa

Change-Id: I4d858aec3c61899f150e1a48571d142075549654

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 26 Jun 2017 20:25:25 +0000 (20:25 +0000)]

Merge "Merge "Fix QS lock screen animation" into oc-dev am: aa2286e417 am: a86cc7098a" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Mon, 26 Jun 2017 20:24:28 +0000 (20:24 +0000)]

Merge "Fix QS lock screen animation" into oc-dev am: aa2286e417
am: a86cc7098a

Change-Id: I120be1f1bda0b853fa308d996465ed9e9abfd441

commit | commitdiff | tree

Jason Monk [Mon, 26 Jun 2017 20:24:20 +0000 (20:24 +0000)]

Merge "Fix QS lock screen animation" into oc-dev am: aa2286e417
am: be163c055e

Change-Id: Ib65d556f261990aae6f4d93e2198c5909cf11733

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 20:19:45 +0000 (20:19 +0000)]

Merge "Only try to autogroup if group info changes"

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 20:13:57 +0000 (20:13 +0000)]

Merge "Filter instant apps with different names" into oc-dev
am: adcc94f160

Change-Id: Ia4d1b58648ceb986b0af014cb6b3a6f6c0b2ce2f

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 20:13:41 +0000 (20:13 +0000)]

Merge "Filter instant apps with different names" into oc-dev
am: adcc94f160

Change-Id: I855a58e6ea0655b4211f2aac0a4a1f9f94f639f2

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 20:12:48 +0000 (20:12 +0000)]

Merge "Added boot time metrics for systemui"

commit | commitdiff | tree

Jason Monk [Mon, 26 Jun 2017 20:12:22 +0000 (20:12 +0000)]

Merge "Fix QS lock screen animation" into oc-dev
am: aa2286e417

Change-Id: I1364155b6a325653d63c74ab407c787756abb5ca

commit | commitdiff | tree

Jason Monk [Mon, 26 Jun 2017 20:12:21 +0000 (20:12 +0000)]

Merge "Fix QS lock screen animation" into oc-dev
am: aa2286e417

Change-Id: I40a6e211fa02a83de09edcfac419b8e78a287e2f

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 20:06:19 +0000 (20:06 +0000)]

Merge "Filter instant apps with different names" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 19:59:20 +0000 (19:59 +0000)]

Merge "Fix QS lock screen animation" into oc-dev

commit | commitdiff | tree

Lucas Dupin [Mon, 26 Jun 2017 19:53:43 +0000 (19:53 +0000)]

Merge "Add missing ints to palette" into oc-dr1-dev am: 56a1a7d331
am: b3c27864c7

Change-Id: I7103c9a40a3ea3fcf91d914bb8b41d80612f61ff

commit | commitdiff | tree

Christine Franks [Mon, 26 Jun 2017 19:52:26 +0000 (19:52 +0000)]

Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev am: ca4def2ac8
am: 21e21efcf9

Change-Id: Iaab165b6465d15f0a960144798c1920fd30ab688

commit | commitdiff | tree

Lucas Dupin [Mon, 26 Jun 2017 19:46:19 +0000 (19:46 +0000)]

Merge "Add missing ints to palette" into oc-dr1-dev
am: 56a1a7d331

Change-Id: I6534542a2ff3c2147ac20c4e3cef841483e86b20

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 19:45:50 +0000 (19:45 +0000)]

Merge "Make PreferenceController a mixin"

commit | commitdiff | tree

Christine Franks [Mon, 26 Jun 2017 19:41:24 +0000 (19:41 +0000)]

Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev
am: ca4def2ac8

Change-Id: I9b847d08144f484bb68a293c0be258fb52fdeb92

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 19:38:38 +0000 (19:38 +0000)]

Merge "Add missing ints to palette" into oc-dr1-dev

commit | commitdiff | tree

Christine Franks [Mon, 26 Jun 2017 19:28:24 +0000 (19:28 +0000)]

Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev

commit | commitdiff | tree

Fan Zhang [Mon, 26 Jun 2017 19:07:59 +0000 (12:07 -0700)]

Fix metrics constant typo

Change-Id: I3aedad10953b6e1d38debd19d74d3bbaffb3835f
Fix: 62955794
Test: builds

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 18:59:39 +0000 (18:59 +0000)]

Merge "relax expected tile modes"

commit | commitdiff | tree

Pankaj Kanwar [Mon, 26 Jun 2017 18:43:24 +0000 (18:43 +0000)]

Merge "Fix the red build." into oc-dr1-dev-plus-aosp
am: 4e5e0fe078 -s ours

Change-Id: I7664379081cc2e6303a907a6405571a703b3e4db

commit | commitdiff | tree

Chet Haase [Mon, 26 Jun 2017 18:41:55 +0000 (18:41 +0000)]

Merge "Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6 am: 32974e0705" into oc-dr1-dev-plus-aosp
am: 74ad86eec7

Change-Id: If51e6a23b784c907f10273f36a4cfd5ea2d9b230

commit | commitdiff | tree

Chet Haase [Mon, 26 Jun 2017 18:40:16 +0000 (18:40 +0000)]

Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6 am: 8714d472bf
am: 10ca6954bd

Change-Id: I594e85c0fc5036d84c5efafadbae832d899c374f

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 18:30:18 +0000 (18:30 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Pankaj Kanwar [Mon, 26 Jun 2017 18:30:11 +0000 (18:30 +0000)]

Merge "Fix the red build." into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 26 Jun 2017 18:29:42 +0000 (18:29 +0000)]

Merge "Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6 am: 32974e0705" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Chet Haase [Mon, 26 Jun 2017 18:28:50 +0000 (18:28 +0000)]

Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6
am: 32974e0705

Change-Id: I452f45754547810e2c54a5fa8d792038b5f558ee

commit | commitdiff | tree

Chet Haase [Mon, 26 Jun 2017 18:28:44 +0000 (18:28 +0000)]

Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6
am: 8714d472bf

Change-Id: I8a4c4bca36bec2e82993d1418e8e7697b2b14511

commit | commitdiff | tree

Evan Laird [Fri, 23 Jun 2017 20:05:33 +0000 (16:05 -0400)]

Use BatteryMeterDrawableBase as QS icon for Battery Saver

This ensures that QS, Settings, and Status bar all use the same drawable
base so they will always look the same. Battery saver is essentially a
full battery that always shows the power saver iconography.

Test: visual; runtest -x
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Bug: 62668861
Change-Id: I8a9d5e59c9bb38c0ef794a0ed591195809521f70

commit | commitdiff | tree

Chet Haase [Mon, 26 Jun 2017 18:18:51 +0000 (18:18 +0000)]

Merge "Fix TimePicker RTL issues" into oc-dev
am: 7b95c932d6

Change-Id: Ie1b08ed95b5182c9d8afb423153568e20ac50fe0

commit | commitdiff | tree

Chet Haase [Mon, 26 Jun 2017 18:18:46 +0000 (18:18 +0000)]

Merge "Fix TimePicker RTL issues" into oc-dev
am: 7b95c932d6

Change-Id: I9ec629e60882aec2b4ca84b0b81de4244d43afef

commit | commitdiff | tree

Chet Haase [Mon, 26 Jun 2017 18:07:25 +0000 (18:07 +0000)]

Merge "Fix TimePicker RTL issues" into oc-dev

commit | commitdiff | tree

Fyodor Kupolov [Sat, 24 Jun 2017 01:20:40 +0000 (18:20 -0700)]

Added boot time metrics for systemui

Logs will be used for boottime performance dashboard.

Test: device boots, SystemUIBootTiming records are logged
Bug: 38429582
Change-Id: I2e7b2fe3a38839880243a36b07fdb407a8f8c9d8

commit | commitdiff | tree

Jeff Sharkey [Mon, 26 Jun 2017 17:02:41 +0000 (11:02 -0600)]

Fix the red build.

Change-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951
(cherry picked from commit 29d670cea1c42d10274c5d97dcc8d2162540956e)
Merged-In: If035d6939f5a465b4b579b590f8f2b5b532e0951

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 17:34:41 +0000 (10:34 -0700)]

Filter instant apps with different names

ag/2447596 introduced a regression that caused instant apps to be
made visible to one another.

Change-Id: I5db9a43f05dd5bec991cc0934b1c9a9406dfade6
Fixes: 62998487
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest

commit | commitdiff | tree

Jason Monk [Mon, 26 Jun 2017 17:55:05 +0000 (17:55 +0000)]

Merge "Add release haptic to nav bar buttons" into oc-dr1-dev am: 43a0236891
am: 02680636eb

Change-Id: I7957392182936abb5b5f394f3c23c70ec3451572

commit | commitdiff | tree

Jason Monk [Mon, 26 Jun 2017 15:22:21 +0000 (11:22 -0400)]

Fix QS lock screen animation

Now that we have a footer, heights and clippings need to be adjusted
to be more accurate.
- Clip QS within its layout box regardless of its y translation
- Calculate height diffs correctly

Test: visual
Change-Id: Ic46996e342cd1000215aa9256da920a7856bb5a4
Fixes: 62489284

commit | commitdiff | tree

Jason Monk [Mon, 26 Jun 2017 17:45:52 +0000 (17:45 +0000)]

Merge "Add release haptic to nav bar buttons" into oc-dr1-dev
am: 43a0236891

Change-Id: I806d35f8a3a1f9f77b88a170add6eeaf52efb95b

commit | commitdiff | tree

Ying Xu [Mon, 26 Jun 2017 17:45:41 +0000 (17:45 +0000)]

Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195 am: e30cfbea60
am: 57ad8be7ec

Change-Id: I2ee40a6c22a1bfe58ca107790719c5695aa7c774

commit | commitdiff | tree

Jeff Sharkey [Mon, 26 Jun 2017 17:41:26 +0000 (17:41 +0000)]

Merge "Progress towards FBE and adoptable storage."

commit | commitdiff | tree

Tony Mantler [Tue, 13 Jun 2017 20:12:22 +0000 (13:12 -0700)]

Make PreferenceController a mixin

Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: I912a9fd00c33034ca1945e92281c15695de32402

commit | commitdiff | tree

Ying Xu [Mon, 26 Jun 2017 17:36:15 +0000 (17:36 +0000)]

Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195
am: e30cfbea60

Change-Id: Iaff6653418289136e24b4a1c16ee4e607d30dca0

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 17:32:40 +0000 (17:32 +0000)]

Merge "Add release haptic to nav bar buttons" into oc-dr1-dev

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 17:28:52 +0000 (17:28 +0000)]

Merge "Merge "null check before dereference" into oc-dev am: df8569787c am: b5af86e444" into oc-dr1-dev-plus-aosp
am: 658d7677fa

Change-Id: I445df1f4ca9f59352ac4885993e68f5a5119b6a6

commit | commitdiff | tree

Ying Xu [Mon, 26 Jun 2017 17:27:21 +0000 (17:27 +0000)]

Merge "Fix the inconsistency of scan status." am: 41be35a1bd
am: ac2d00a195

Change-Id: Ibcdbe63349031ea95d137dd18465bec5de6efd7a

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 17:27:12 +0000 (17:27 +0000)]

Merge "null check before dereference" into oc-dev am: df8569787c am: 6939301147
am: 8c18322a58

Change-Id: I9be94377b57340e5e4bbcdecacd009eae0324bdd

commit | commitdiff | tree

TreeHugger Robot [Mon, 26 Jun 2017 17:20:59 +0000 (17:20 +0000)]

Merge "Use classloader namespace instead of lib paths to load WebView libs."

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 26 Jun 2017 17:20:12 +0000 (17:20 +0000)]

Merge "Merge "null check before dereference" into oc-dev am: df8569787c am: b5af86e444" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Todd Kennedy [Mon, 26 Jun 2017 17:18:43 +0000 (17:18 +0000)]

Merge "null check before dereference" into oc-dev am: df8569787c
am: 6939301147

Change-Id: I9867cce02601d139893edef2c2cc6f89da1d74a9

commit | commitdiff | tree

Ying Xu [Mon, 26 Jun 2017 17:18:42 +0000 (17:18 +0000)]

Merge "Fix the inconsistency of scan status."
am: 41be35a1bd

Change-Id: Ic92aa1aa9ecd91cd072257c93e12cdf030cdeba8

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help