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

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 589bdcd1f6 -s ours
am: 01db8c5648 -s ours

Change-Id: Ie3db845bc9cc54970650ca3a7264a14bf02064fc

commit | commitdiff | tree

Jovana Knezevic [Fri, 13 Apr 2018 19:31:46 +0000 (12:31 -0700)]

Merge "Merge "Prevents showing Guests in switcher." into pi-dev am: 027a967389" into pi-dev-plus-aosp
am: d8cc6c5307

Change-Id: I2e21a51ccff5961c36db236d1aec6386f2252a76

[automerger skipped] Merge "Add filegroup for supporting apache-http stubs generation." am: 828f14d58a am: 25a088a857 -s ours
am: 152b882488 -s ours

Change-Id: I27693328ab0a2817a069952fb0db72473d3db1ec

Merge "Add optional metadata to specify icon's background color." into pi-dev am: 72634cae72
am: 7ecc1ff2b4

Change-Id: Ib10b160be813bf57404a66be167c4534d19aa4a8

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 589bdcd1f6 -s ours

Change-Id: I317ec56e5a7d287e14a387cf08c4888ab4bc78aa

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f2799545f5 -s ours
am: 5ea19f4fb5 -s ours

Change-Id: I2b50dc3feb7c3803b66ad83a4f323c7b69572e0a

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 13 Apr 2018 19:00:16 +0000 (19:00 +0000)]

Merge "Merge "Prevents showing Guests in switcher." into pi-dev am: 027a967389" into pi-dev-plus-aosp

commit | commitdiff | tree

Jovana Knezevic [Fri, 13 Apr 2018 18:59:46 +0000 (11:59 -0700)]

Merge "Prevents showing Guests in switcher." into pi-dev
am: 027a967389

Change-Id: Ib59d45e420e3a05c272cd9bd2a0e0c95b44a6688

commit | commitdiff | tree

Ryan Mitchell [Fri, 13 Apr 2018 18:59:02 +0000 (11:59 -0700)]

Merge "AAPT2: GetBag infinite recursion fix" into pi-dev am: 3ddd801449
am: 7b13ad69ec

Change-Id: I0fa176974242707aecd6d0d593670e13c0a9012d

[automerger skipped] Merge "Add filegroup for supporting apache-http stubs generation." am: 828f14d58a
am: 25a088a857 -s ours

Change-Id: I2dd9118d2c6ca912ce6271f966989292f638ece0

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 18:47:30 +0000 (18:47 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

Merge "Add optional metadata to specify icon's background color." into pi-dev
am: 72634cae72

Change-Id: If469bf3f35e7cb9816f56ab90c966e7114c0a731

Merge "Add filegroup for supporting apache-http stubs generation."
am: 828f14d58a

Change-Id: I89b6c648aa9136219c949607ff704486f429457c

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: f2799545f5 -s ours

Change-Id: Ia0ab74ed882a130754d70488f67a8ccd4f0c7701

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7e41f31bc2 -s ours
am: c1d18390b1 -s ours

Change-Id: I7b5a85018e2a7ed2cd5a1d84c38cdaa8ded3462c

commit | commitdiff | tree

Ryan Mitchell [Fri, 13 Apr 2018 18:31:37 +0000 (11:31 -0700)]

Merge "AAPT2: GetBag infinite recursion fix" into pi-dev
am: 3ddd801449

Change-Id: I7f007e8d2ebe4e288759892cf4c9365e80490e38

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b6134dc727 -s ours
am: 930851666b -s ours

Change-Id: I8bd70c9f7abc6c8d02cc956e1ccfce6122d330c3

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 04543e7ab3 -s ours
am: e7fd15af09 -s ours

Change-Id: Ia910feed8f00ca7bbf2289511be201607bd9178c

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 7e41f31bc2 -s ours

Change-Id: I9a40628b9d1f3abd1279043837aba6853a295cee

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 2e9addbad7 -s ours
am: 972b49678e -s ours

Change-Id: I7f35d9b23f6fef6f3f937ef44a64a5271f5eeaa0

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 04e0ef903e -s ours
am: 14602e4a79 -s ours

Change-Id: Ic6d287ef3bd216aa2778a1209374ab73242f0c34

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: b6134dc727 -s ours

Change-Id: Ia1cb9519ada5712f7f6a109d3b5e4051dd0ea7e7

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 213639c93e -s ours
am: 0875bc7463 -s ours

Change-Id: Ie1344ebeaba599cfe9c0311570c9890d7fae34c0

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 04543e7ab3 -s ours

Change-Id: If6a28bb8248393d2de550fcbe2110f2885b5bd7e

commit | commitdiff | tree

Michael Wright [Fri, 13 Apr 2018 18:11:05 +0000 (11:11 -0700)]

Merge "Revert "Fixed power manager CTS test."" into pi-dev am: ca1dcfb23e
am: ad93f44a3e

Change-Id: I84dc34980d768ee8807c4d9b045a1971dfdbff03

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 2e9addbad7 -s ours

Change-Id: I2b7d409f55e7b7d9af5ea15e89fd63bbc64610fb

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 04e0ef903e -s ours

Change-Id: Ib94d814b181735e3a03c617a1cfc17ec61f2e261

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 213639c93e -s ours

Change-Id: I0820d2d422bfcd388d604e4193998c3856b2221b

commit | commitdiff | tree

Michael Wright [Fri, 13 Apr 2018 17:59:47 +0000 (10:59 -0700)]

Merge "Revert "Fixed power manager CTS test."" into pi-dev
am: ca1dcfb23e

Change-Id: Ie748557c6940961635cdd929238f1bd2070e8804

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 07d10c7ac5 -s ours
am: 32a7b15762 -s ours

Change-Id: If9a13de2934c4edec069df5e7241c7f225dff18e

commit | commitdiff | tree

Jovana Knezevic [Fri, 13 Apr 2018 17:49:32 +0000 (17:49 +0000)]

Merge "Prevents showing Guests in switcher." into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:48:22 +0000 (17:48 +0000)]

Merge "Add optional metadata to specify icon's background color." into pi-dev

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 07d10c7ac5 -s ours

Change-Id: I8025fb04a57a060a4b843341ec2a347a0a8e7dc7

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:44:39 +0000 (17:44 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

Ryan Mitchell [Fri, 13 Apr 2018 17:44:11 +0000 (17:44 +0000)]

Merge "AAPT2: GetBag infinite recursion fix" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:42:03 +0000 (17:42 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:41:09 +0000 (17:41 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:40:15 +0000 (17:40 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:38:13 +0000 (17:38 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

Merge "Fixed power manager CTS test." into pi-dev am: 62444d4950
am: 33ca88a1fc

Change-Id: I3ed21dbc86c56ab1a9182607bb7bba7bbc73229e

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:36:14 +0000 (17:36 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:34:19 +0000 (17:34 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

Michael Wright [Fri, 13 Apr 2018 17:33:15 +0000 (17:33 +0000)]

Merge "Revert "Fixed power manager CTS test."" into pi-dev

commit | commitdiff | tree

Michael Wright [Fri, 13 Apr 2018 17:29:37 +0000 (17:29 +0000)]

Revert "Fixed power manager CTS test."

This reverts commit 48fed61da3f3671850aae3c521a3e6f088169de2.

Reason for revert: m checkbuild failing
Bug: 77907164

Change-Id: I7f75dafc049581a7a5393c3cf0108c488eecaf48

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:31:19 +0000 (17:31 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

Treehugger Robot [Fri, 13 Apr 2018 17:28:22 +0000 (17:28 +0000)]

Merge "Add filegroup for supporting apache-http stubs generation."

Merge "Fixed power manager CTS test." into pi-dev
am: 62444d4950

Change-Id: I96d0acccf64a86a241178241dc6fc9b069f29ac8

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4b4d9e11273bc8d2fa97a86e8f9b71d7c05f6b8c

commit | commitdiff | tree

Winson Chung [Fri, 13 Apr 2018 17:06:18 +0000 (10:06 -0700)]

Merge "Initialize the animation leash with the current values" into pi-dev am: 9f54f109bb
am: d981ee95f4

Change-Id: I4458ef4aa86b96cd4ff6340bcbca39a1c5e20dbf

Merge "Mark location-related PendingIntents as restricted" into pi-dev am: b3ac00ea9c
am: 581881e092

Change-Id: I6b5d176ddb999cc43cbe26d96dc513fa4c3a8f93

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 16:59:28 +0000 (16:59 +0000)]

Merge "Fixed power manager CTS test." into pi-dev

commit | commitdiff | tree

Winson Chung [Fri, 13 Apr 2018 16:53:06 +0000 (09:53 -0700)]

Merge "Initialize the animation leash with the current values" into pi-dev
am: 9f54f109bb

Change-Id: Ida4d8c0c53f963b4c1bee20d4879bb2bfdf779db

Merge "Mark location-related PendingIntents as restricted" into pi-dev
am: b3ac00ea9c

Change-Id: Ie9ca7886858033c2ca46d090d46e74679b4e0c23

commit | commitdiff | tree

Winson Chung [Fri, 13 Apr 2018 16:41:18 +0000 (16:41 +0000)]

Merge "Initialize the animation leash with the current values" into pi-dev

Merge "Mark location-related PendingIntents as restricted" into pi-dev

Merge "Don't show ringer status if dnd overrides it" into pi-dev am: a4e8196cf8
am: 3197513e32

Change-Id: Iad0d04f0557c384835595e503c239e1cd28ef2b9

Merge "Don't show ringer status if dnd overrides it" into pi-dev
am: a4e8196cf8

Change-Id: Ic6f4fcf844c403f117a49843f5b6ea84f943be41

AAPT2: GetBag infinite recursion fix

Style resources with circular parental dependencies caused infinite
recursion when calling AssetManager2::GetBag. This fix allows recursion
to cease when a circular dependency is found.

Bug: 77928512
Change-Id: Ib900c36ab1aef5da5b03234a9484c4dad3b63c02
Test: Manual test of b/77928512 and duplicates of 74493983

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 15:43:22 +0000 (15:43 +0000)]

Merge "Don't show ringer status if dnd overrides it" into pi-dev

commit | commitdiff | tree

David Brazdil [Fri, 13 Apr 2018 15:10:49 +0000 (08:10 -0700)]

Merge "Add more hidden API on light greylist" into pi-dev am: d55a940e9f
am: 6bf2691066

Change-Id: I750d20365ec5257a64c6ef325dcf29875f4d84ac

commit | commitdiff | tree

David Brazdil [Fri, 13 Apr 2018 14:58:43 +0000 (07:58 -0700)]

Merge "Add more hidden API on light greylist" into pi-dev
am: d55a940e9f

Change-Id: I2c126962323a65e04314b1e8aeb0bafc4c03aa98

commit | commitdiff | tree

David Brazdil [Fri, 13 Apr 2018 14:46:47 +0000 (14:46 +0000)]

Merge "Add more hidden API on light greylist" into pi-dev

Fixed power manager CTS test.

Added an annotation necessary to allow the power manager CTS test to
access the non-public method nap.

Test: adb install -r \
      out/host/linux-x86/cts/android-cts/testcases/CtsOsTestCases.apk
      adb shell am instrument -e class android.os.cts.PowerManagerTest \
      -w android.os.cts/android.support.test.runner.AndroidJUnitRunner

Change-Id: I91e591be608f5040bc035a203d7e94c83d50bf15
Fixes: 77907164

Merge "Protect slice permissions text" into pi-dev am: e791b67448
am: b1922e640f

Change-Id: Ifb56bd57e49406a4ffe251067e1be46518ead8f9

Merge "Protect slice permissions text" into pi-dev
am: e791b67448

Change-Id: If65f285e9525b9f5b5212e3fede65ef4d378c312

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 13:40:10 +0000 (13:40 +0000)]

Merge "Protect slice permissions text" into pi-dev

Merge "Do not allow QS to collapsed when customizing." into pi-dev am: e7cda17369
am: d96b5ed171

Change-Id: Ia0035037b2726a75f0386dee3e50f22d573a23cc

Merge "Do not allow QS to collapsed when customizing." into pi-dev
am: e7cda17369

Change-Id: Ib204944c69d8bef3e894e350dd29ef9856eade43

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5b400d5bf5084cfdfc40edd2e44f19d5b1b659ac

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1832a5760945374d87d8d01b3289e3b67014da9c

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 12:54:15 +0000 (12:54 +0000)]

Merge "Do not allow QS to collapsed when customizing." into pi-dev

[automerger skipped] Merge "Make android.test.mock.stubs in Android.bp" am: 5f29cbb53b am: cfd30c5f43 -s ours
am: 18cae2e213 -s ours

Change-Id: I5bc63733a7373bdfcda14f747c78ba67f7267a9e

[automerger skipped] Merge "Make android.test.mock.stubs in Android.bp" am: 5f29cbb53b
am: cfd30c5f43 -s ours

Change-Id: If050bb11934319b44b7513ffcec0d6020edf5571

Merge "Make android.test.mock.stubs in Android.bp"
am: 5f29cbb53b

Change-Id: I8859b904e6413a6bf1055fdb9f21e100d9e68d6a

commit | commitdiff | tree

Chalard Jean [Fri, 13 Apr 2018 12:05:02 +0000 (05:05 -0700)]

Merge "Notif manager and captive portal app to read SSID again" into pi-dev am: 249b1a34c3
am: 9cb91ef301

Change-Id: I588fedba49ea5d08e40bd2b3ea8ba2c2383958ec

commit | commitdiff | tree

Chalard Jean [Fri, 13 Apr 2018 11:52:08 +0000 (04:52 -0700)]

Merge "Notif manager and captive portal app to read SSID again" into pi-dev
am: 249b1a34c3

Change-Id: I663a59ff2847a9f44ea1395326f6cb00e97237b6

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 11:41:32 +0000 (11:41 +0000)]

Merge "Notif manager and captive portal app to read SSID again" into pi-dev

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic5c3b8a83e48276c715b767d5a0cb9b61debe0b9

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I306b4fef65e3282c9b4c43839dd64667152a4f66

commit | commitdiff | tree

Treehugger Robot [Fri, 13 Apr 2018 10:55:05 +0000 (10:55 +0000)]

Merge "Make android.test.mock.stubs in Android.bp"

commit | commitdiff | tree

Emilian Peev [Fri, 13 Apr 2018 10:49:20 +0000 (03:49 -0700)]

Merge "CameraProxy: Clear calling identity before scheduling" into pi-dev am: fdad4c513d
am: 71a331d66a

Change-Id: I4a4e5102dd4d6240573033c678265a38737b4822

commit | commitdiff | tree

Eran Messeri [Fri, 13 Apr 2018 10:41:09 +0000 (03:41 -0700)]

Merge "AttestationUtils: Request MEID explicitly" into pi-dev am: ec6268c514
am: 3ae9a11cc3

Change-Id: I0bd82a0d811c482debb4795a444ea2d0eefbdc88

commit | commitdiff | tree

Emilian Peev [Fri, 13 Apr 2018 10:32:14 +0000 (03:32 -0700)]

Merge "CameraProxy: Clear calling identity before scheduling" into pi-dev
am: fdad4c513d

Change-Id: Ia6bf69e08b8b2949077e93345e27bc61b6bcc073

Merge "PointerLocation: do not letterbox for cutouts" into pi-dev am: 637422b2bf
am: 7b31adef36

Change-Id: If9c39591eb505740af5d91e31c7357d3d56ca002

commit | commitdiff | tree

Eran Messeri [Fri, 13 Apr 2018 10:22:24 +0000 (03:22 -0700)]

Merge "AttestationUtils: Request MEID explicitly" into pi-dev
am: ec6268c514

Change-Id: I024cb4ef4743271ae24526e96c0786ae97028733

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 10:13:43 +0000 (10:13 +0000)]

Merge "CameraProxy: Clear calling identity before scheduling" into pi-dev

Merge "PointerLocation: do not letterbox for cutouts" into pi-dev
am: 637422b2bf

Change-Id: Iecf814ec2e79f8624af88104ba581ea634063658

commit | commitdiff | tree

Eran Messeri [Fri, 13 Apr 2018 10:07:36 +0000 (10:07 +0000)]

Merge "AttestationUtils: Request MEID explicitly" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 09:59:45 +0000 (09:59 +0000)]

Merge "PointerLocation: do not letterbox for cutouts" into pi-dev

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I88071bb02adecf089e39dfee4a6add3f5ded6cae

commit | commitdiff | tree

Chalard Jean [Fri, 13 Apr 2018 09:23:18 +0000 (02:23 -0700)]

Merge "Add a new ssid field in NetworkCapabilities." into pi-dev am: 878d0e90b5
am: 8edf6543d2

Change-Id: I6dd1aba6fde5a502b4a9145cf16393d8ce623c89

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib75133d5980ff748e1e9ed9f3fba99ffc40629f2

commit | commitdiff | tree

Chalard Jean [Fri, 13 Apr 2018 09:14:02 +0000 (02:14 -0700)]

Merge "Add a new ssid field in NetworkCapabilities." into pi-dev
am: 878d0e90b5

Change-Id: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib2d68bcafafbf825f4f78870f815c3a43aadd8fe

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 08:59:23 +0000 (08:59 +0000)]

Merge "Add a new ssid field in NetworkCapabilities." into pi-dev

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie360a601ab29fe76cb0df7c0b8ba43480de9bfd3

commit | commitdiff | tree

Benjamin Franz [Fri, 13 Apr 2018 08:04:21 +0000 (01:04 -0700)]

Merge "Silently ignore force stop API for protected packages" into pi-dev am: df88614db2
am: 83612737a1

Change-Id: I3dc4209e0310495a2c6a035094e919a46f75a03f

commit | commitdiff | tree

Benjamin Franz [Fri, 13 Apr 2018 07:51:25 +0000 (00:51 -0700)]

Merge "Silently ignore force stop API for protected packages" into pi-dev
am: df88614db2

Change-Id: I1490c123b60b05798584306af9c971a3411729cc

Merge "Use Scrypt to hash all passwords in RecoverableKeyStore" into pi-dev am: 2bc6f2e46a
am: 48b5b445b7

Change-Id: I79bfd6563b5e5c8ce03d28f574f751dfa51d33b9

Merge "Use Scrypt to hash all passwords in RecoverableKeyStore" into pi-dev
am: 2bc6f2e46a

Change-Id: Ia9ed056e9b33ec7375a3b61ece17f22eb1d16f0d