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

Merge "Support stats log in lmkd." into pi-dev am: dcd71294a4
am: 4ea3ecbc14

Change-Id: I0df060654430e40089ca43c4b350ab5b96b1a6c2

Merge "Support stats log in lmkd." into pi-dev
am: dcd71294a4

Change-Id: I2607f3f94cc74e5bddccc664acbd8f139af85151

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 20:34:32 +0000 (20:34 +0000)]

Merge "remove BakedOps and much of renderstate"

Merge "Support stats log in lmkd." into pi-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 4 May 2018 19:58:50 +0000 (19:58 +0000)]

Merge "Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev am: 7bfb942e2d am: 3f1c2382c9"

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 19:58:27 +0000 (12:58 -0700)]

Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev am: 7bfb942e2d
am: 3f1c2382c9

Change-Id: If002ec36dfa98c5699b5f6270eb60e22b1dffa87

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 19:58:10 +0000 (19:58 +0000)]

Merge "Spun off Autofill PERF tests on its own package..."

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 19:51:44 +0000 (12:51 -0700)]

Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev
am: 7bfb942e2d

Change-Id: Id064e40dd38100f25936d0c977f6018c560c0076

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 19:50:35 +0000 (12:50 -0700)]

Merge "Allow gestures to executed started from deadzone on nav bar" into pi-dev am: ffee7c7211
am: fd61dedd92

Change-Id: I67112885dbb789d1afaf4ac1f23af9d181c189ae

Merge "Connected MAC Randomization Metrics Proto" into pi-dev am: 506512789d
am: a3329bce9d

Change-Id: I457a665a74c56a034fe36688b40102ff1a42644c

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 19:44:07 +0000 (12:44 -0700)]

Merge "Allow gestures to executed started from deadzone on nav bar" into pi-dev
am: ffee7c7211

Change-Id: I5f28cff723b3c2c64e2ace8cd346b03ca70beef6

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 19:35:44 +0000 (19:35 +0000)]

Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev

Merge "Connected MAC Randomization Metrics Proto" into pi-dev
am: 506512789d

Change-Id: Iaaea18f695c429e0d69cdb71e5164e88f28a6be0

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 19:34:57 +0000 (19:34 +0000)]

Merge "Pass full context to Minikin"

Merge "Fix incorrect background bounds set by stackscroll view" into pi-dev am: 565ea8f348
am: 3fa4231d8b

Change-Id: I20cfa59d3a6ee46efd29229d771bee358fab8e93

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 19:30:28 +0000 (19:30 +0000)]

Merge "Allow gestures to executed started from deadzone on nav bar" into pi-dev

Merge "Connected MAC Randomization Metrics Proto" into pi-dev

Merge "Fix incorrect background bounds set by stackscroll view" into pi-dev
am: 565ea8f348

Change-Id: I22967ce3704c7e2d8a25d6c84cb12fe59326238f

remove BakedOps and much of renderstate

Test: make

Change-Id: If070b7436b848c6840abfac5f051b0f5b6cb17ce

Merge "Fix incorrect background bounds set by stackscroll view" into pi-dev

Support readback of TextureView into 565 and extended sRGB. am: 2324991a77
am: 1babd54e4c

Change-Id: Idad79c50a32cdb4c65042da13d08eb68a27fcd6c

[automerger skipped] Merge "Enabled area info update for India" am: 72cf718d20 am: d8f78542e8 -s ours
am: 20086c7045 -s ours

Change-Id: If433dc520a8dd724b52ba2e1cc928865550154d4

Support readback of TextureView into 565 and extended sRGB.
am: 2324991a77

Change-Id: If80572b06965089415c32b6ded8b6b1b5fda19b5

Merge "Schedule local activity relaunch" into pi-dev am: 1ed9f4294c
am: aad8cbf14e

Change-Id: I135975e50bde928f5d18cd0993f22b1d857fbb44

[automerger skipped] Merge "Enabled area info update for India" am: 72cf718d20
am: d8f78542e8 -s ours

Change-Id: If7fb1a4d8d5de7ed29c8f309e4c84a25340763f8

Support readback of TextureView into 565 and extended sRGB.

Bug: 78906699
Test: CtsViewTestCases
Change-Id: I89e8544a883dcb3eb222c164ab57d20e55a073c3

Spun off Autofill PERF tests on its own package...

...so bugs on it (like starving the UI Thread) don't impact other tests

Test: mmma -j ./frameworks/base/apct-tests/perftests/autofill/ && \
  adb install -r $OUT/data/app/AutofillPerfTests/AutofillPerfTests.apk && \
  adb shell am instrument -w -e class android.view.autofill.LoginTest \
  com.android.perftests.autofill/android.support.test.runner.AndroidJUnitRunner

Bug: 38345816

Change-Id: I76346f1d1c45790788400fcd9765f6b424d99f4c

Merge "Schedule local activity relaunch" into pi-dev
am: 1ed9f4294c

Change-Id: I7ff272e057bed855ce187aa759f197807a50d683

Merge "Enabled area info update for India"
am: 72cf718d20

Change-Id: Iebf82433948808948cc11f74104f5a3aee340475

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 18:27:14 +0000 (11:27 -0700)]

Merge "Resume swipe up when notification shade is opened" into pi-dev am: 0c664986ac
am: a6c4a09f3c

Change-Id: Id21ef4d4b80e0827e674ba2eeba675c85b5d4577

Allow gestures to executed started from deadzone on nav bar

Set slippery to true when gesture starts from deadzone and when finished
set slippery to its correct state.

Change-Id: I035d12f9639ce4af00db9e0d25b514f074b5198c
Fixes: 78886558
Test: swipe up from deadzone on nav bar (just above home button)

Merge "Schedule local activity relaunch" into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 18:20:56 +0000 (11:20 -0700)]

Merge "[Notif] Fix BH & Snooze button bounds and UI" into pi-dev am: c09a39d73c
am: f0064ce09d

Change-Id: I8392f79628eb31d274a549fbc46b4d9683e1652d

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 18:16:50 +0000 (11:16 -0700)]

Merge "Resume swipe up when notification shade is opened" into pi-dev
am: 0c664986ac

Change-Id: I5cd37990352e37360a773544adba26e4ff280401

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 18:16:44 +0000 (11:16 -0700)]

Merge "Just drop the default WP bitmap, don't explicitly recycle it" into pi-dev am: 018166c16e
am: 9f275bd435

Change-Id: I77b78cb14e3cb7df901f8dd077c5c91faa21cf16

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 18:08:35 +0000 (11:08 -0700)]

Merge "[Notif] Fix BH & Snooze button bounds and UI" into pi-dev
am: c09a39d73c

Change-Id: Id184eae69bbce9e191e6be0e2bc291081adc07cd

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 18:04:48 +0000 (18:04 +0000)]

Merge "Resume swipe up when notification shade is opened" into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 18:04:24 +0000 (18:04 +0000)]

Merge "remove shadow related references"

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 18:04:11 +0000 (11:04 -0700)]

Merge "Just drop the default WP bitmap, don't explicitly recycle it" into pi-dev
am: 018166c16e

Change-Id: If56a713c4c8032fbf4cd0707715d6952ba641ee4

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 17:50:24 +0000 (17:50 +0000)]

Merge "[Notif] Fix BH & Snooze button bounds and UI" into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 17:47:04 +0000 (17:47 +0000)]

Merge "Just drop the default WP bitmap, don't explicitly recycle it" into pi-dev

Merge "Delete a bunch of code"

Merge "Add @SystemApi to related VR functions that will be used by VrCore Services."

remove shadow related references

Test: make

Change-Id: I1fc387ee442ca9120ff4f80248cc2395e93128f6

Merge "Enabled area info update for India"

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 16:23:18 +0000 (16:23 +0000)]

Merge "wifi: implement hashCode to be consistent with equals"

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 14:15:02 +0000 (07:15 -0700)]

Merge "Update dnd defaults for new users" into pi-dev am: 8aec7be10e
am: e799bda2e0

Change-Id: Ia9dff7647091ebdd62738030b888d0d805b043b3

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 14:05:10 +0000 (07:05 -0700)]

Merge "Update dnd defaults for new users" into pi-dev
am: 8aec7be10e

Change-Id: I2f6bdb45f12e90ea3a1d6ce01f2bebcd82a8b31e

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 13:54:27 +0000 (13:54 +0000)]

Merge "Update dnd defaults for new users" into pi-dev

Merge "Light grey some View APIs." into pi-dev am: 854c050ccb
am: 954dec64b0

Change-Id: Ifd717f9663b8eaf5f9fb2dd1218a8b43fadcae3d

Merge "Light grey some View APIs." into pi-dev
am: 854c050ccb

Change-Id: Iba28e31113c4f23727db00860fddf2cdf3c791e6

Merge "Light grey some View APIs." into pi-dev

Merge "Add more light grey APIs." into pi-dev am: a0e2aa194f
am: 9e1549cc7a

Change-Id: I26dbfa981759ff712a18bbe37c968d0b1e0edac0

Merge "Add more light grey APIs." into pi-dev
am: a0e2aa194f

Change-Id: I398e9c48d2d245c72dcd66533ab748e5ec57ab63

Merge "Add more light grey APIs." into pi-dev

Fix incorrect background bounds set by stackscroll view

Even if the stackscroll view is the same width as notification panel
view, it doesn't guarantee the left position is 0 in window(when nav bar
is on the left side).

Always use location in window to set the left position instead.

Test: runtest systemui
Test: manual 1) change display size to largest 2) rotate to landscape 3)
expand notification panel and check
Fixes: 74988082

Change-Id: I06641c145365e315192e0b2b6c44d075a3016733

Light grey some View APIs.

bug: 79206637
Test: m
Change-Id: Ibbc28177f7946367657f9880a7f255488fb4d0cc

wifi: implement hashCode to be consistent with equals

Per Effective Java, if a class implements equals(),
it should override hashCode().

Test: (new) unit tests
Bug: 37000525
Change-Id: If4175a7e2bc34935c525d0fb96fbbe1e904030e3

Fix default launcher setting is reset after restoring

1. Do not remove launcher's prefer activity set during SetupWizard
2. Bypass SetupWizard's launcher activity during SetupWizard

Bug: 31955881

Test: m -j RunFrameworksServicesRoboTests
Change-Id: I035198186363d7adf65bb7ec5e4cc74260e290ea

[automerger skipped] Merge "[DO NOT MERGE] [Companion] Nullcheck if ListView is null" into pi-dev am: 8df7766b0b
am: 96fbbcae74 -s ours

Change-Id: I0abe900d3a5944a28162f83401458e4f4c65d53e

Merge "[DO NOT MERGE] [Companion] Nullcheck if ListView is null" into pi-dev
am: 8df7766b0b

Change-Id: Ia63928128a95f88872cfcee1dad5f87850cc66a4

Merge "[DO NOT MERGE] [Companion] Nullcheck if ListView is null" into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 03:29:00 +0000 (20:29 -0700)]

Merge "Adding a wrapper around Tonal API" into pi-dev am: 790d1a0efa
am: 122150603c

Change-Id: I19460f95a651e3f38686949c4c52621ae4293c6c

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 03:20:58 +0000 (20:20 -0700)]

Merge "Adding a wrapper around Tonal API" into pi-dev
am: 790d1a0efa

Change-Id: Iff442e50199b7ad8ca3538820562b8b975353e48

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 03:15:56 +0000 (20:15 -0700)]

Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev am: ec41a069fd
am: c1d985cf8b

Change-Id: I4df0cd841757ed13a9f7bf0f5bbf4d2df8ff0fb2

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 03:09:19 +0000 (03:09 +0000)]

Merge "Adding a wrapper around Tonal API" into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 03:07:48 +0000 (20:07 -0700)]

Merge "Turns DEBUG to false in statsd." into pi-dev am: 1e9761df82
am: 77e1d3fc95

Change-Id: I59e2723e423748e24a5985d7db8377ce0588aef0

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 03:03:53 +0000 (20:03 -0700)]

Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev
am: ec41a069fd

Change-Id: If18ec5d227a70e070a1a66d9a229de04d986d27f

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:58:48 +0000 (19:58 -0700)]

Merge "Metrics for user choices in storage wizard." into pi-dev am: 1e42d8f76b
am: d6b216de7f

Change-Id: I5e3cd2a93c6833ac33864c06a1ed5c8e93d9d211

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:58:24 +0000 (19:58 -0700)]

Merge "Turns DEBUG to false in statsd." into pi-dev
am: 1e9761df82

Change-Id: I4f1f138ce9f1e2526c8ba44d0b6d8b6be7a2b63c

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:47:10 +0000 (19:47 -0700)]

Merge "Metrics for user choices in storage wizard." into pi-dev
am: 1e42d8f76b

Change-Id: I7b21817142cbdaa51350c0f41751b3f0c45f6ecc

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:46:31 +0000 (19:46 -0700)]

Merge "Reduced the opacity of the ripple when dark" into pi-dev am: 69a053ccce
am: c114904d12

Change-Id: Ida015dd78dd2e45f8b4f73fe92d0dacace200898

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:43:03 +0000 (02:43 +0000)]

Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:41:44 +0000 (02:41 +0000)]

Merge "Turns DEBUG to false in statsd." into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:35:57 +0000 (19:35 -0700)]

Merge "Fixed the RTL appearance of messagingStyle" into pi-dev am: 7a86424275
am: 7b7cf30351

Change-Id: I700511fb06376abd8de7b5be7aadf2607551a868

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:32:11 +0000 (19:32 -0700)]

Merge "Reduced the opacity of the ripple when dark" into pi-dev
am: 69a053ccce

Change-Id: I635d861ef2281378719964b7ab545bd436175cfc

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:32:09 +0000 (02:32 +0000)]

Merge "Metrics for user choices in storage wizard." into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:27:19 +0000 (19:27 -0700)]

Merge "Correct insets for getNonMinimizedSplitScreenSecondaryBounds" into pi-dev am: 040fc4cfdf
am: ad2a736739

Change-Id: I44d6a26209a76bca5ba8b4fff99e921a9e4e89d7

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:23:02 +0000 (19:23 -0700)]

Merge "Fixed the RTL appearance of messagingStyle" into pi-dev
am: 7a86424275

Change-Id: I1bfb6f11faed88cedccced1a5863511f7c72b45c

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:18:28 +0000 (19:18 -0700)]

Merge "Correct insets for getNonMinimizedSplitScreenSecondaryBounds" into pi-dev
am: 040fc4cfdf

Change-Id: I6f47ed0879a5ea72993049df59ece1eb299c6988

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:16:22 +0000 (02:16 +0000)]

Merge "Reduced the opacity of the ripple when dark" into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:12:22 +0000 (02:12 +0000)]

Merge "Fixed the RTL appearance of messagingStyle" into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 02:08:23 +0000 (02:08 +0000)]

Merge "Correct insets for getNonMinimizedSplitScreenSecondaryBounds" into pi-dev

Merge "Make Autofill PERF tests more lenient to error."

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 01:54:43 +0000 (18:54 -0700)]

Merge "Fixed a leak with TransformStates" into pi-dev am: 650d79e7af
am: f73e79ba30

Change-Id: Ifb899656faf6b8f2c64a6c67a5ab14094cc6fdf3

Merge "Fix issue where line breaks would be wrong" into pi-dev am: dd49a8ccd7
am: c1bf01b026

Change-Id: I65b2ccc5cb365f341300b13476799bd101913c80

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 01:43:02 +0000 (18:43 -0700)]

Merge "Fixed a leak with TransformStates" into pi-dev
am: 650d79e7af

Change-Id: I5c20e88a79cd3eab981dbfd339f132e42c4dc46c

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 01:40:44 +0000 (18:40 -0700)]

Merge "Bigger ownerInfo padding" into pi-dev am: 96dc1ca74e
am: 6e69842874

Change-Id: I1697397a0aafc7cb0c0220da8982d926a6ac68fb

Merge "Fix issue where line breaks would be wrong" into pi-dev
am: dd49a8ccd7

Change-Id: I144652e4ae256ff714e919f040e180aa64081584

Merge "Update views when next slice is null" into pi-dev am: 88e264576a
am: 5ae43b4e39

Change-Id: I55ce1ebd406239bcecae1a05e97107e7d9fe80cb

Adding a wrapper around Tonal API

Bug: 79111591
Test: Verified API on launcher build
Change-Id: I84e0e8b9d5cfb8c915dcc1123d150df4ecb3a9b1

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 01:33:00 +0000 (18:33 -0700)]

Merge "Bigger ownerInfo padding" into pi-dev
am: 96dc1ca74e

Change-Id: I058acb76ff1d92c29fd35bff51a24c83b7355806

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 01:30:05 +0000 (18:30 -0700)]

[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev am: 8d16d7915d am: eaa6d200b3 -s ours am: 4d94bf0498 -s ours am: df1dbb0bfa -s ours
am: c34fb2b13e -s ours

Change-Id: Ia8a8f54a4a47d881bc0357ff8fa819c67417e61f

Merge "Update views when next slice is null" into pi-dev
am: 88e264576a

Change-Id: I51146ff0981c0d11df251aff373ffafa5273b80e

Merge "Changed the way the ellipsizing of text is measured" into pi-dev am: 497fa8b8ab
am: de0ec73030

Change-Id: Iac49fa43c932e66f1f437c06cab9f32cb16dcab1

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 01:22:56 +0000 (18:22 -0700)]

[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev am: 8d16d7915d am: eaa6d200b3 -s ours am: 4d94bf0498 -s ours
am: df1dbb0bfa -s ours

Change-Id: Id5a442c513e67f70d37f72b3f2a4a2742171d7d1

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 01:22:06 +0000 (01:22 +0000)]

Merge "Fixed a leak with TransformStates" into pi-dev

Merge "Fix issue where line breaks would be wrong" into pi-dev

commit | commitdiff | tree

android-build-team Robot [Fri, 4 May 2018 01:15:47 +0000 (01:15 +0000)]