OSDN Git Service
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
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
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
TreeHugger Robot [Wed, 11 Oct 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
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
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
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
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
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
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
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
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
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
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
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
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
Colin Cross [Wed, 11 Oct 2017 18:37:19 +0000 (18:37 +0000)]
Merge "Convert libjnigraphics to Android.bp"
am:
006c167544
Change-Id: Ic07a49510c946104f74ad72a830aed9696a2ddd6
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
Colin Cross [Wed, 11 Oct 2017 18:18:45 +0000 (18:18 +0000)]
Merge "Convert libjnigraphics to Android.bp"
TreeHugger Robot [Wed, 11 Oct 2017 18:12:33 +0000 (18:12 +0000)]
Merge "Send a11y updates for updated notifications" into oc-mr1-dev
Bernardo Rufino [Wed, 11 Oct 2017 17:50:06 +0000 (17:50 +0000)]
Canonicalize notification channel sounds for backup
am:
2d7a4a3f67
Change-Id: I47c5aba70bd6713f5cd2432b1141d0772fa1e672
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
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
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
Jordan Liu [Wed, 11 Oct 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Add MM#6 string overlay"
am:
b53262c148
Change-Id: I1cbdba97bba4e0074c60ce374978ffb0b0cca8de
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
Jordan Liu [Wed, 11 Oct 2017 16:15:39 +0000 (16:15 +0000)]
Merge "Add MM#6 string overlay"
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
Andreas Gampe [Wed, 11 Oct 2017 16:00:51 +0000 (16:00 +0000)]
Merge "EventLogHelper: Clean up code"
am:
386a5687dd
Change-Id: Id2bfdb49859d9ad62e733b8037e27b54bbdb3537
Treehugger Robot [Wed, 11 Oct 2017 15:48:46 +0000 (15:48 +0000)]
Merge "EventLogHelper: Clean up code"
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
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
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
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
Treehugger Robot [Wed, 11 Oct 2017 12:42:41 +0000 (12:42 +0000)]
Merge "IpManager: add display name for helpful logging, and Network"
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
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
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
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
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
Treehugger Robot [Wed, 11 Oct 2017 04:00:16 +0000 (04:00 +0000)]
Merge "Log upstream network suspend/resume callbacks"
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
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
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)
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
TreeHugger Robot [Wed, 11 Oct 2017 01:35:07 +0000 (01:35 +0000)]
Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev
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
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
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
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
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
TreeHugger Robot [Tue, 10 Oct 2017 22:58:25 +0000 (22:58 +0000)]
Merge "Logs UID that requested a bugreport." into oc-mr1-dev
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
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
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
TreeHugger Robot [Tue, 10 Oct 2017 22:22:38 +0000 (22:22 +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
Andreas Gampe [Tue, 10 Oct 2017 21:29:12 +0000 (21:29 +0000)]
Merge "LoggingPrintStream: Make visible for testing" am:
7d1789867b am:
dcb8cf8732
am:
0db4c361e3
Change-Id: I10e61d65cd05c8d93d43a2fefee841023ec35889
Andreas Gampe [Tue, 10 Oct 2017 21:20:18 +0000 (21:20 +0000)]
Merge "LoggingPrintStream: Make visible for testing" am:
7d1789867b
am:
dcb8cf8732
Change-Id: I11119803f2176704e1f7ca8a36e7b62cf93f377b
Andreas Gampe [Tue, 10 Oct 2017 21:11:10 +0000 (21:11 +0000)]
Merge "LoggingPrintStream: Make visible for testing"
am:
7d1789867b
Change-Id: If6e464f6840b66deb6f6c61b0ca96d847444e910
Treehugger Robot [Tue, 10 Oct 2017 20:57:55 +0000 (20:57 +0000)]
Merge "LoggingPrintStream: Make visible for testing"
Brad Ebinger [Mon, 9 Oct 2017 18:23:21 +0000 (11:23 -0700)]
Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.
Test: Manual, Telephony Test MBMS app
Bug:
67640102
Merged-In: I25b39008317e333d422cd32a0c6348c010ca280f
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
Hyunyoung Song [Tue, 10 Oct 2017 17:35:59 +0000 (10:35 -0700)]
Wrap StackOverflowError in NotFoundException.
Bug:
67462465
Test: builds and tested using faulty apk with recursive drawable.
Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e
Julia Reynolds [Tue, 10 Oct 2017 17:58:49 +0000 (13:58 -0400)]
Send a11y updates for updated notifications
Unless the updated notification is quiet.
Test: runtest systemui-notification
Change-Id: I0d0b27cedf085c00648d00ed63f252f94d8e5e35
Fixes:
67626983
Brad Ebinger [Tue, 10 Oct 2017 18:57:23 +0000 (18:57 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" am:
432c2b0fb9 am:
3b6df532f3
am:
8765abcc9e
Change-Id: I25b39008317e333d422cd32a0c6348c010ca280f
Brad Ebinger [Tue, 10 Oct 2017 18:48:08 +0000 (18:48 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" am:
432c2b0fb9
am:
3b6df532f3
Change-Id: I4d9031d32f59953d7b86cf361635c7d7f08fdf32
Brad Ebinger [Tue, 10 Oct 2017 18:39:56 +0000 (18:39 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"
am:
432c2b0fb9
Change-Id: I3332d44105c6ce4f8d4223caad66715c4c67d52f
Brad Ebinger [Tue, 10 Oct 2017 18:27:36 +0000 (18:27 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"
Michael Wright [Tue, 10 Oct 2017 18:09:49 +0000 (18:09 +0000)]
Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev
am:
33238f213f
Change-Id: Ie20f60f76ddce6c634df005ecd4d7f7d9d0d9651
Andreas Gampe [Tue, 10 Oct 2017 18:01:22 +0000 (18:01 +0000)]
Merge "Parcel: Avoid NPE in finalization" am:
b085deece9 am:
cb34bdf55c
am:
7934a7f828
Change-Id: I5c2819892170855c4d009261785f9e8d26f9ad5e
Andreas Gampe [Tue, 10 Oct 2017 17:52:50 +0000 (17:52 +0000)]
Merge "Parcel: Avoid NPE in finalization" am:
b085deece9
am:
cb34bdf55c
Change-Id: Idd444cd9dfe78d4200f67a4fe6b3c4fb13767f29
Michael Wright [Tue, 10 Oct 2017 17:50:56 +0000 (17:50 +0000)]
Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev
Andreas Gampe [Tue, 10 Oct 2017 17:35:55 +0000 (17:35 +0000)]
Merge "Parcel: Avoid NPE in finalization"
am:
b085deece9
Change-Id: I646baf55627a3874a10775846458af5f1dcd5d8c
Brad Ebinger [Tue, 10 Oct 2017 17:26:22 +0000 (17:26 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev
am:
ad545464c2 -s ours
Change-Id: I9285e05fb9278057240769648c3fa23c2b271ced
Treehugger Robot [Tue, 10 Oct 2017 17:20:56 +0000 (17:20 +0000)]
Merge "Parcel: Avoid NPE in finalization"
Vlad Zavidovych [Thu, 5 Oct 2017 22:37:13 +0000 (15:37 -0700)]
Add header to DropBox crash reports to indicate instant app crash
Bug:
62372653
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I5a3d293d4bd7b54b6fcfe26516e51aff15354ded
(cherry picked from commit
9cab93555579dd73607dfa4f526ea3a0df456843)
Brad Ebinger [Tue, 10 Oct 2017 17:14:35 +0000 (17:14 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev
Andreas Gampe [Tue, 10 Oct 2017 17:10:24 +0000 (17:10 +0000)]
Merge "{Event,Security}Log: Unify code" am:
0c614c7018 am:
812b09d6bd
am:
7f49276388
Change-Id: I6947796df7a7673081d30a38f529be239b7defaf
Andreas Gampe [Tue, 10 Oct 2017 03:13:21 +0000 (20:13 -0700)]
EventLogHelper: Clean up code
Use scoped wrappers and unique_ptr.
Bug:
67511924
Test: m
Test: Device boots
Test: cts-tradefed run commandAndExit cts -m CtsUtilTestCases -t android.util.cts.EventLogTest
Change-Id: If9abfb8b43a4653ccd7fc553257ab3529063577f
Andreas Gampe [Tue, 10 Oct 2017 16:58:40 +0000 (16:58 +0000)]
Merge "{Event,Security}Log: Unify code" am:
0c614c7018
am:
812b09d6bd
Change-Id: I6ee5bbd2923ef7561739eb5cd14471ae87528a72
Andreas Gampe [Tue, 10 Oct 2017 16:50:37 +0000 (16:50 +0000)]
Merge "{Event,Security}Log: Unify code"
am:
0c614c7018
Change-Id: Id43119d11e27b0e0f6bf064e3aa76f8c990b64a4
Andrew Solovay [Tue, 10 Oct 2017 16:42:31 +0000 (16:42 +0000)]
Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev
am:
c4a0b34248
Change-Id: I96c464236f694b194e9f5a6aba68b40ad840035d
Treehugger Robot [Tue, 10 Oct 2017 16:41:12 +0000 (16:41 +0000)]
Merge "{Event,Security}Log: Unify code"
Andrew Solovay [Tue, 10 Oct 2017 16:29:06 +0000 (16:29 +0000)]
Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev
Andreas Gampe [Tue, 10 Oct 2017 16:09:26 +0000 (09:09 -0700)]
LoggingPrintStream: Make visible for testing
The class must be public to avoid test issues. If the class is
package-private, the test would have to be in the boot class-
path:
Rejecting re-init on previously-failed class java.lang.Class<com.android.internal.os.LoggingPrintStreamTest$TestPrintStream>: java.lang.IllegalAccessError: Class com.android.internal.os.LoggingPrintStream extended by class com.android.internal.os.LoggingPrintStreamTest$TestPrintStream is inaccessible (declaration of 'com.android.internal.os.LoggingPrintStreamTest$TestPrintStream' appears in /data/app/com.android.frameworks.coretests-SD7GJmYE507ACoE9gu2mnw==/base.apk)
at java.lang.Object java.lang.reflect.Constructor.newInstance0(java.lang.Object[]) (Constructor.java:-2)
at java.lang.Object java.lang.reflect.Constructor.newInstance(java.lang.Object[]) (Constructor.java:334)
at junit.framework.Test junit.framework.TestSuite.createTest(java.lang.Class, java.lang.String) (TestSuite.java:61)
Test: m
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java
Change-Id: I26cead7954cf4309c8b3e16994c35a3f4a9eb798
Andreas Gampe [Tue, 10 Oct 2017 15:01:38 +0000 (08:01 -0700)]
Parcel: Avoid NPE in finalization
Check whether the guard is null to avoid:
Uncaught exception thrown by finalizer
java.lang.NullPointerException: Attempt to invoke virtual method 'void dalvik.system.CloseGuard.close()' on a null object reference
at android.os.ParcelFileDescriptor.closeWithStatus(ParcelFileDescriptor.java:740)
at android.os.ParcelFileDescriptor.finalize(ParcelFileDescriptor.java:990)
at java.lang.Daemons$FinalizerDaemon.doFinalize(Daemons.java:250)
at java.lang.Daemons$FinalizerDaemon.runInternal(Daemons.java:237)
at java.lang.Daemons$Daemon.run(Daemons.java:103)
at java.lang.Thread.run(Thread.java:764)
Follow-up to commit
da5a3e12f4f8f965c57d6f93c74190f43ea233f3.
Bug:
7426029
Bug:
10330121
Test: m
Change-Id: I903f1545ab784008727ff23bb95fe182bd95b62a
Hugo Benichi [Tue, 10 Oct 2017 14:31:48 +0000 (14:31 +0000)]
Merge "LinkProperties: fix some indentation issues" am:
a162726df7 am:
e3b6b636cf
am:
a63788076a
Change-Id: Ife901fd1c9c30b3864ddce61326f2d5caacd0bae
Hugo Benichi [Tue, 10 Oct 2017 14:21:57 +0000 (14:21 +0000)]
Merge "LinkProperties: fix some indentation issues" am:
a162726df7
am:
e3b6b636cf
Change-Id: I8c639ddce8408d302f0aede2490d226ca9c4bd8c
Hugo Benichi [Tue, 10 Oct 2017 14:13:45 +0000 (14:13 +0000)]
Merge "LinkProperties: fix some indentation issues"
am:
a162726df7
Change-Id: If9bc7cf980aa14880dbf6cc43bc86cc269d306cb
Treehugger Robot [Tue, 10 Oct 2017 14:02:35 +0000 (14:02 +0000)]
Merge "LinkProperties: fix some indentation issues"
Hugo Benichi [Tue, 10 Oct 2017 07:29:06 +0000 (16:29 +0900)]
LinkProperties: fix some indentation issues
Test: no functional change
Change-Id: I469bba154feb382156e56043d83f066a5bd658aa
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
Change-Id: Id6e143edc9f5b0256aa637643680f6c8dce70d90
Jaewan Kim [Tue, 10 Oct 2017 05:51:41 +0000 (05:51 +0000)]
Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev
am:
9bc71c4922
Change-Id: I3806838a0cd2e4ebe6bdf27fafcd22afe177bb22
TreeHugger Robot [Tue, 10 Oct 2017 05:44:55 +0000 (05:44 +0000)]
Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev
Andreas Gampe [Mon, 9 Oct 2017 23:21:11 +0000 (16:21 -0700)]
{Event,Security}Log: Unify code
Extract common code into eventlog_helper.
Bug:
67511924
Test: m
Test: Device boots
Test: cts-tradefed run commandAndExit cts -m CtsUtilTestCases -t android.util.cts.EventLogTest
Change-Id: Idafad832385f57c22f40dbb8570e95da6d44f08f
Andrew Solovay [Sat, 7 Oct 2017 02:02:28 +0000 (19:02 -0700)]
docs: Tiny usage fix ("e-mail" -> "email")
I needed to make an edit in this branch to verify part of our docs
process, so I found a Javadoc typo to fix. No code error, just took
out the hyphen in "e-mail" in a Javadoc comment.
Test: make ds-docs
Bug:
67515954
Change-Id: Icb9b2a9df0d7dfd697050735886adec80bc92ff8
Colin Cross [Sun, 8 Oct 2017 01:38:31 +0000 (18:38 -0700)]
Convert libjnigraphics to Android.bp
See build/soong/README.md for more information.
Test: m -j
Change-Id: If302f63276fa815423f50df0f12c1700975dbc43
Merged-In: If302f63276fa815423f50df0f12c1700975dbc43
(cherry picked from commit
02a8657837321c12ec81207bf43e3ace61b3962f)
Andrew Solovay [Tue, 10 Oct 2017 01:35:20 +0000 (01:35 +0000)]
Merge "docs: Adding API level 27 (Oreo MR1) to the docs build options" into oc-mr1-dev
am:
64b23cca4d
Change-Id: I4d71688ec991555d400e5ce86baad61270bba9b9
Andrew Solovay [Tue, 10 Oct 2017 01:19:14 +0000 (01:19 +0000)]
Merge "docs: Adding API level 27 (Oreo MR1) to the docs build options" into oc-mr1-dev
Brad Ebinger [Mon, 9 Oct 2017 18:23:21 +0000 (11:23 -0700)]
Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.
Test: Manual, Telephony Test MBMS app
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
Andreas Gampe [Mon, 9 Oct 2017 23:45:11 +0000 (23:45 +0000)]
Merge "EventLog: Check for exception after add()" am:
c30a6ac2f1 am:
f8fa4b8352
am:
d145cab07b
Change-Id: I5162438a7951512a179e15e7de4c20ec5aaecd97
OSDN Git Service
