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

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

Jeff Sharkey [Wed, 11 Oct 2017 22:26:38 +0000 (22:26 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849
am: 5712d1fb47

Change-Id: Id5d6dd68924837f09d6f2b1178ce41c2d1e81219

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Oct 2017 22:16:07 +0000 (22:16 +0000)]

Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: e2a1e9f7d8" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 22:13:37 +0000 (22:13 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6
am: e2a1e9f7d8

Change-Id: I7a72aa1793c5e45434f50c4d810164fbbfd70ef9

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 22:11:51 +0000 (22:11 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf
am: a7f0504849

Change-Id: Ib17c9471d7f3bdde18e3de4ad693fd9ef5312059

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Oct 2017 22:06:40 +0000 (22:06 +0000)]

Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev am: 383ab095f5" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 22:02:35 +0000 (22:02 +0000)]

Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev
am: 383ab095f5

Change-Id: Ic1d6542b99aa8e559c17826a32ed128610c964b0

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Oct 2017 21:59:03 +0000 (21:59 +0000)]

Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: 0de1d85a01" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:56:49 +0000 (21:56 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6
am: 0de1d85a01

Change-Id: I61273206efb364da1317666b199fda6a0ecb5c12

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:52:08 +0000 (21:52 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours
am: 3b47256ccf

Change-Id: Ie321b5922ec83367ec93e528993fb205ebcad1ac

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Oct 2017 21:50:42 +0000 (21:50 +0000)]

Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:48:19 +0000 (21:48 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194
am: 8bfef31ce0

Change-Id: I79106ed066b76f9597d74e56498fa3a9c6258f7f

commit | commitdiff | tree

Jean-Michel Trivi [Wed, 11 Oct 2017 21:48:00 +0000 (21:48 +0000)]

Merge "Fix alarm preview volume" into oc-mr1-dev
am: b9629cd432

Change-Id: If5bc5bbdb5239609db61e4706c6b2395b0231f83

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:38:30 +0000 (21:38 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3
am: 4a71a2daf6

Change-Id: Id8a401121d8bff24b5695f0ad0d4c923da93995c

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:36:45 +0000 (21:36 +0000)]

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:34:24 +0000 (21:34 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a
am: 97f6a0da40 -s ours

Change-Id: Icd0d048be2d037fa19befb94ccd8d6fda26bee74

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:32:36 +0000 (21:32 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9
am: e0e1c8ae4c

Change-Id: I4ace250ae2b4998e7c77f361dddd47f815b9ad27

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Oct 2017 21:26:04 +0000 (21:26 +0000)]

Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c
am: da3d10591a

Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:23:11 +0000 (21:23 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9
am: e6f60d0fcb

Change-Id: Ia9d41c8a74dd6862e27c9712ff404efa75caeda4

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:21:51 +0000 (21:21 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279
am: 3f671b3194

Change-Id: I16c9f75cf0181b834cbfa1a7e716aaced2768c5e

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 21:19:54 +0000 (21:19 +0000)]

Merge "Fix alarm preview volume" into oc-mr1-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:19:01 +0000 (21:19 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279
am: 3f671b3194

Change-Id: I9abdd6f2df64398385a98686d66c4c043939adc6

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:18:21 +0000 (21:18 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours
am: 7f108b81b3

Change-Id: I87e6ae95c5a4be28cd268bac73548de83cf61ed6

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:12:09 +0000 (21:12 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0
am: 72df97053c

Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:04:06 +0000 (21:04 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9
am: 98371ee7c9

Change-Id: I02c6f8314289abbc0639c634c478f293ecd1d679

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:03:59 +0000 (21:03 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9
am: 98371ee7c9

Change-Id: Ib74482b52dcd5e3ac21b4b61e6a56f3293cddbd5

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 21:00:20 +0000 (21:00 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2
am: e1ae848970 -s ours

Change-Id: Ic511d47f88b86fa999beae0363da07ee4fc1a3be

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:57:08 +0000 (20:57 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
am: 31c5adc279

Change-Id: Id9a5a0216f1f26e059df45cc866582fe04cdf47d

commit | commitdiff | tree

Julia Reynolds [Wed, 11 Oct 2017 20:54:39 +0000 (20:54 +0000)]

Merge "Check target api version before crashing apps." into oc-mr1-dev
am: 4e733f3074

Change-Id: I41d02093b1a471123e4dffd90da8cacffa23e769

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c
am: b4d23d55c2

Change-Id: Idfcdf295be77c9ab39d790e7793d2d772c92f9f7

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a
am: 4a60106aa0

Change-Id: Iaace5d103229b9028d1b81602107af35857ca55c

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:46:21 +0000 (20:46 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours
am: 5f17a285f9

Change-Id: I9971bfff1c0792f78e4afe17a101ba6e6ae0cd2f

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 20:37:04 +0000 (20:37 +0000)]

Merge "Check target api version before crashing apps." into oc-mr1-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:34:50 +0000 (20:34 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
am: 9d3706046c

Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:34:48 +0000 (20:34 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am: 254369967a

Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 20:34:39 +0000 (20:34 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Oct 2017 20:33:34 +0000 (20:33 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: ae4dc78421 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Wed, 11 Oct 2017 20:30:25 +0000 (20:30 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
am: 09984216e6 -s ours

Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 20:29:08 +0000 (20:29 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours
am: 311fa22ecb -s ours

Change-Id: Ib222f7ef5dd91dba7814a9c10501c0f8b36cd2d0

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 20:28:29 +0000 (20:28 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours
am: ae4dc78421 -s ours

Change-Id: Iac2f9bb0d8b117c4882fe052e95120dc85bf8086

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 20:23:53 +0000 (20:23 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 20:23:33 +0000 (20:23 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 20:22:22 +0000 (20:22 +0000)]

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 20:17:36 +0000 (20:17 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours
am: 1018a5d4a1 -s ours

Change-Id: Iee62f36c79ce3056bf3b100251bd78e760655718

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 20:17:36 +0000 (20:17 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours
am: 1018a5d4a1 -s ours

Change-Id: I7edb906e7c2e0e76cb4a523d3e70418c57fc14bd

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 20:09:44 +0000 (20:09 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: e721fbddb5 -s ours

Change-Id: Ic2a012410d13daece6049836eb20f1109011a4a6

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 19:59:02 +0000 (19:59 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Oct 2017 19:57:11 +0000 (19:57 +0000)]

Merge "Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours am: bb04ab9aa1 -s ours am: c59fcd86c6 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 19:54:17 +0000 (19:54 +0000)]

Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours am: bb04ab9aa1 -s ours
am: c59fcd86c6 -s ours

Change-Id: I55d7df7de1c5e3a98d1e773e9836f48522b3b49f

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 19:52:47 +0000 (19:52 +0000)]

Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours am: bb04ab9aa1 -s ours
am: a97edf7785 -s ours

Change-Id: Iea7996be9531e2dd9c8def44ea3fb88728e63963

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 19:47:28 +0000 (19:47 +0000)]

Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours
am: bb04ab9aa1 -s ours

Change-Id: I66453d66b491ecff9aacc7fd53eece6e0e1ea351

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 19:47:14 +0000 (19:47 +0000)]

Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours
am: bb04ab9aa1 -s ours

Change-Id: Ia8b54c4fec8e8fec06bdca38bf948af8a222e8b2

commit | commitdiff | tree

Felipe Leme [Wed, 11 Oct 2017 19:43:34 +0000 (19:43 +0000)]

Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev
am: a4dffa032b

Change-Id: I01afae63e1fa5503104244c2e78dfb589697a467

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 19:37:05 +0000 (19:37 +0000)]

Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours
am: fcde0eda85 -s ours

Change-Id: I68381bf426aedbb2a0bb365364f7462ab3bdb585

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 19:34:45 +0000 (19:34 +0000)]

Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 19:27:42 +0000 (19:27 +0000)]

Import translations. DO NOT MERGE am: 757057a5b5 -s ours
am: 6fd592553c -s ours

Change-Id: I2488e81c41395d3aedf20f02f61dfb9f67c5aa29

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 19:20:06 +0000 (19:20 +0000)]

Import translations. DO NOT MERGE
am: 757057a5b5 -s ours

Change-Id: I35b629a43daf6ef991fc4ec61a4aba933cad0ae2

commit | commitdiff | tree

Colin Cross [Wed, 11 Oct 2017 18:58:04 +0000 (18:58 +0000)]

Merge "Convert libjnigraphics to Android.bp" am: 006c167544 am: 2fbccabbca
am: 1adda8b8b3

Change-Id: Ia832e5fb8a49928e28891b7c398368af25717f48

commit | commitdiff | tree

Colin Cross [Wed, 11 Oct 2017 18:45:37 +0000 (18:45 +0000)]

Merge "Convert libjnigraphics to Android.bp" am: 006c167544
am: 2fbccabbca

Change-Id: I7fea93c95baee3812fdf48805bb883e3afd172c1

commit | commitdiff | tree

Colin Cross [Wed, 11 Oct 2017 18:37:19 +0000 (18:37 +0000)]

Merge "Convert libjnigraphics to Android.bp"
am: 006c167544

Change-Id: Ic07a49510c946104f74ad72a830aed9696a2ddd6

commit | commitdiff | tree

Julia Reynolds [Wed, 11 Oct 2017 18:23:56 +0000 (18:23 +0000)]

Merge "Send a11y updates for updated notifications" into oc-mr1-dev
am: 85e7dbc93e

Change-Id: Iaabe6d5820feefb2de29a5a37fb28af84cc0622b

commit | commitdiff | tree

Colin Cross [Wed, 11 Oct 2017 18:18:45 +0000 (18:18 +0000)]

Merge "Convert libjnigraphics to Android.bp"

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 18:12:33 +0000 (18:12 +0000)]

Merge "Send a11y updates for updated notifications" into oc-mr1-dev

commit | commitdiff | tree

Julia Reynolds [Wed, 11 Oct 2017 12:44:46 +0000 (08:44 -0400)]

Check target api version before crashing apps.

All foreground service notifications need to be posted to a valid
notification channel, but only crash apps that don't provide a
valid notification if they target O_MR1+.

Fixes: 66905243
Test: manual, open apps with invalid notifications that do and don't
target O_MR1.

Change-Id: I60897302bf9806cba0e0be365e65c5e8c4ef4806

commit | commitdiff | tree

Bernardo Rufino [Wed, 11 Oct 2017 17:50:06 +0000 (17:50 +0000)]

Canonicalize notification channel sounds for backup
am: 2d7a4a3f67

Change-Id: I47c5aba70bd6713f5cd2432b1141d0772fa1e672

commit | commitdiff | tree

Felipe Leme [Tue, 10 Oct 2017 22:53:04 +0000 (15:53 -0700)]

Document how to handle save on multi-steps activity.

Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Fixes: 67650364

Change-Id: Ib9e6c63e537b47a0670fe6bdf5163e8ab80eef0c

commit | commitdiff | tree

Jordan Liu [Wed, 11 Oct 2017 16:50:01 +0000 (16:50 +0000)]

Merge "Add MM#6 string overlay" am: b53262c148 am: 939db64461
am: 8d6a7d9ffa

Change-Id: I558d0a8e148305bfcc7c6adb762d50d091b1782e

commit | commitdiff | tree

Jordan Liu [Wed, 11 Oct 2017 16:41:01 +0000 (16:41 +0000)]

Merge "Add MM#6 string overlay" am: b53262c148
am: 939db64461

Change-Id: Id85dd22241293b0f77b4d70e8f3391b6d4048f46

commit | commitdiff | tree

Jordan Liu [Wed, 11 Oct 2017 16:31:10 +0000 (16:31 +0000)]

Merge "Add MM#6 string overlay"
am: b53262c148

Change-Id: I1cbdba97bba4e0074c60ce374978ffb0b0cca8de

commit | commitdiff | tree

Andreas Gampe [Wed, 11 Oct 2017 16:18:18 +0000 (16:18 +0000)]

Merge "EventLogHelper: Clean up code" am: 386a5687dd am: 9b24969314
am: 6f42d696df

Change-Id: I8de0d17c3fb50d7065e662235e4018268fa745b9

commit | commitdiff | tree

Jordan Liu [Wed, 11 Oct 2017 16:15:39 +0000 (16:15 +0000)]

Merge "Add MM#6 string overlay"

commit | commitdiff | tree

Andreas Gampe [Wed, 11 Oct 2017 16:09:36 +0000 (16:09 +0000)]

Merge "EventLogHelper: Clean up code" am: 386a5687dd
am: 9b24969314

Change-Id: I7eb8083e7471f2fff528c049ef7cdf2d20da4e24

commit | commitdiff | tree

Andreas Gampe [Wed, 11 Oct 2017 16:00:51 +0000 (16:00 +0000)]

Merge "EventLogHelper: Clean up code"
am: 386a5687dd

Change-Id: Id2bfdb49859d9ad62e733b8037e27b54bbdb3537

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Oct 2017 15:48:46 +0000 (15:48 +0000)]

Merge "EventLogHelper: Clean up code"

commit | commitdiff | tree

Bernardo Rufino [Tue, 3 Oct 2017 12:55:10 +0000 (13:55 +0100)]

Canonicalize notification channel sounds for backup

Canonicalize for backup and canonicalize and uncanonicalize for restore
(see comment).

Test: Set custom notification sound, make backup, remove notification
sound from device (from Ringtones and make sure to update media content
provider), restore => Observe default instead of random number. Do the
same without removing the sound and observe restores successfully.
Test: runtest systemui-notification
Bug: 66444697

(cherry picked from commit c27bb6ad34fd59161f6460b692ba72c7ede789b6)

Change-Id: I32c186d0d7479b01f6cc67cce9bc5cb66264a064

commit | commitdiff | tree

Erik Kline [Wed, 11 Oct 2017 13:11:46 +0000 (13:11 +0000)]

Merge "IpManager: add display name for helpful logging, and Network" am: ed0b030e17 am: d0c68dec76
am: 0f779624ad

Change-Id: I1aa820a7d9bd4c04174e3fc7f93505e2083994d6

commit | commitdiff | tree

Erik Kline [Wed, 11 Oct 2017 13:03:02 +0000 (13:03 +0000)]

Merge "IpManager: add display name for helpful logging, and Network" am: ed0b030e17
am: d0c68dec76

Change-Id: Ie650f985c17d16e972e43e66653561200d2e4ef2

commit | commitdiff | tree

Erik Kline [Wed, 11 Oct 2017 12:52:23 +0000 (12:52 +0000)]

Merge "IpManager: add display name for helpful logging, and Network"
am: ed0b030e17

Change-Id: I9b5fb4b995e351dfed74bfe83993e379c87305d6

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Oct 2017 12:42:41 +0000 (12:42 +0000)]

Merge "IpManager: add display name for helpful logging, and Network"

commit | commitdiff | tree

Erik Kline [Wed, 4 Oct 2017 11:28:54 +0000 (20:28 +0900)]

IpManager: add display name for helpful logging, and Network

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 62476366
Change-Id: I509506814fa704e54f3d67158203276312a24fa1

commit | commitdiff | tree

Bill Yi [Wed, 11 Oct 2017 07:21:44 +0000 (00:21 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I9b8f913edd4d61427600f47c91644750e6dff3c5

commit | commitdiff | tree

Erik Kline [Wed, 11 Oct 2017 04:26:52 +0000 (04:26 +0000)]

Merge "Log upstream network suspend/resume callbacks" am: 645cd2ad26 am: cc92587976
am: 47806bee11 -s ours

Change-Id: I457670ee375a85d19b7ce96991a2139a0ce725e3

commit | commitdiff | tree

Erik Kline [Wed, 11 Oct 2017 04:17:50 +0000 (04:17 +0000)]

Merge "Log upstream network suspend/resume callbacks" am: 645cd2ad26
am: cc92587976

Change-Id: I6e2fe9d6e9a030eaee8ed359b630f2a81a833ae3

commit | commitdiff | tree

Erik Kline [Wed, 11 Oct 2017 04:08:55 +0000 (04:08 +0000)]

Merge "Log upstream network suspend/resume callbacks"
am: 645cd2ad26

Change-Id: I375e47a21d2fc6a5e67ff6367087c22beceb6377

commit | commitdiff | tree

Treehugger Robot [Wed, 11 Oct 2017 04:00:16 +0000 (04:00 +0000)]

Merge "Log upstream network suspend/resume callbacks"

commit | commitdiff | tree

Lucas Dupin [Wed, 11 Oct 2017 03:03:39 +0000 (03:03 +0000)]

Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev
am: 43aca9cdc8

Change-Id: I3de9cb8713cd0df80aeffc21c29bcfc9a3818d92

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 02:55:29 +0000 (02:55 +0000)]

Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev

commit | commitdiff | tree

Erik Kline [Tue, 10 Oct 2017 02:54:08 +0000 (11:54 +0900)]

Log upstream network suspend/resume callbacks

Also log signal strength while we're at it:

    2017-10-10T14:05:00.968 - [UpstreamNetworkMonitor] preferred upstream type: WIFI
    2017-10-10T14:06:07.654 - [UpstreamNetworkMonitor] upstream network signal strength: -62 -> -67
    2017-10-10T14:06:13.704 - [UpstreamNetworkMonitor] upstream network signal strength: -67 -> -64

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 64976634
Bug: 67396342

Merged-In: I9121798bba0be9dcdf1e45d39c092020620fa53b
Merged-In: I1d3420380691efd886315275598134b98f4041ed
Change-Id: Id6e143edc9f5b0256aa637643680f6c8dce70d90
(cherry picked from commit 60caf7d29132262dd4a077b68daa807d22773524)

commit | commitdiff | tree

Erik Kline [Wed, 11 Oct 2017 01:43:00 +0000 (01:43 +0000)]

Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev
am: ab10e1a7db

Change-Id: I9121798bba0be9dcdf1e45d39c092020620fa53b

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Oct 2017 01:35:07 +0000 (01:35 +0000)]

Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 10 Oct 2017 23:32:38 +0000 (16:32 -0700)]

Fix alarm preview volume

SeekBarVolumizer: do not use FLAG_BYPASS_INTERRUPTION_POLICY as
there is no need to bypass DnD modes in seek bar for volume
since they are disabled according to the DnD mode.
AudioService (PlaybackActivityMonitor): check both
AudioAttributes flags BYPASS_INTERRUPTION_POLICY and
BYPASS_MUTE for forced alarm playback (see b/63617557).

Test: see bug
Bug: 67578783
Change-Id: Iaf43f16d96d1ad8a1eacc73a050db767004ba96b

commit | commitdiff | tree

Lucas Dupin [Wed, 11 Oct 2017 00:31:09 +0000 (17:31 -0700)]

Fixed problem where scrim transition would be cancelled

Change-Id: I089e499bfaf524898f5156aecaf098c94b9a1b2b
Fixes: 64077859
Test: send notifications, look at AoD

commit | commitdiff | tree

Vlad Zavidovych [Wed, 11 Oct 2017 00:12:20 +0000 (00:12 +0000)]

Merge "Add header to DropBox crash reports to indicate instant app crash" into oc-mr1-dev
am: 20bfcce92b

Change-Id: Ie91ec3018d0274b1447c6d292aba91f7da67eecd

commit | commitdiff | tree

Vlad Zavidovych [Tue, 10 Oct 2017 23:46:42 +0000 (23:46 +0000)]

Merge "Add header to DropBox crash reports to indicate instant app crash" into oc-mr1-dev

commit | commitdiff | tree

Felipe Leme [Tue, 10 Oct 2017 23:40:25 +0000 (23:40 +0000)]

Merge "Logs UID that requested a bugreport." into oc-mr1-dev
am: 95f359e963

Change-Id: I13997828a5295d2d9a4aea0ee63904a4b4628eaa

commit | commitdiff | tree

Brad Ebinger [Tue, 10 Oct 2017 23:05:50 +0000 (23:05 +0000)]

Merge "Require DownloadRequest#Builder to have mandatory Source URI" into oc-mr1-dev
am: 74f88fe858 -s ours

Change-Id: I63b64247707f2bb14b1cba3b0a6278eeb36a363e

commit | commitdiff | tree

TreeHugger Robot [Tue, 10 Oct 2017 22:58:25 +0000 (22:58 +0000)]

Merge "Logs UID that requested a bugreport." into oc-mr1-dev

commit | commitdiff | tree

Brad Ebinger [Tue, 10 Oct 2017 22:47:18 +0000 (22:47 +0000)]

Merge "Require DownloadRequest#Builder to have mandatory Source URI" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Tue, 10 Oct 2017 22:31:12 +0000 (15:31 -0700)]

Import translations. DO NOT MERGE

Change-Id: I4d38b1392fb97117f7a403a224fc65a871dcea19
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Hyunyoung Song [Tue, 10 Oct 2017 22:30:23 +0000 (22:30 +0000)]

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev
am: 384689934d

Change-Id: Id4885fe270e24d54830d6858e37487de551a3f52

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help