OSDN Git Service
Brad Ebinger [Wed, 11 Oct 2017 22:39:14 +0000 (22:39 +0000)]
Merge "Add new Download Error Codes" am:
e9bd5449b5
am:
946ff79971
Change-Id: I756df5c78a96a59468f54ac35e9668d66cf64901
Brad Ebinger [Wed, 11 Oct 2017 22:24:58 +0000 (22:24 +0000)]
Merge "Add new Download Error Codes"
am:
e9bd5449b5
Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358
Android Build Merger (Role) [Wed, 11 Oct 2017 22:14:32 +0000 (22:14 +0000)]
Merge "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" into oc-dr1-dev-plus-aosp
Brad Ebinger [Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +0000)]
Merge "Add new Download Error Codes"
Jeff Sharkey [Wed, 11 Oct 2017 22:11:49 +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: I08b0a31acd8044b1fb1676052f853bbc1b1201a1
Dan Albert [Wed, 11 Oct 2017 22:07:46 +0000 (22:07 +0000)]
Merge "Add missing includes." am:
4be4bb3db7
am:
41c08f49b4
Change-Id: I67b30cd624fe42521097c20cc45ee6db19c0d43e
Dan Albert [Wed, 11 Oct 2017 21:52:41 +0000 (21:52 +0000)]
Merge "Add missing includes."
am:
4be4bb3db7
Change-Id: Icdae2b63df8e5d61e6acabb6fb85efa28026d535
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
Treehugger Robot [Wed, 11 Oct 2017 21:37:28 +0000 (21:37 +0000)]
Merge "Add missing includes."
Jeff Sharkey [Wed, 11 Oct 2017 21:36:45 +0000 (21:36 +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: I0fef13605c0a2da1b787bc11ac4ec06926665ba2
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Dan Albert [Wed, 11 Oct 2017 19:41:26 +0000 (12:41 -0700)]
Add missing includes.
Test: mma
Bug: None
Change-Id: Iec8b0a7854091946a4bb6e804c5f4cce39a52b47
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
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: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
Colin Cross [Wed, 11 Oct 2017 18:18:45 +0000 (18:18 +0000)]
Merge "Convert libjnigraphics to Android.bp"
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
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"
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: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"
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)
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
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 [Tue, 10 Oct 2017 01:06:59 +0000 (18:06 -0700)]
Add new Download Error Codes
Adds new MBMS Download Session error codes to allow for
more fine grained error reporting to the client app.
Test: Manual
Change-Id: I9c2163d934835efaaa145e4c0f8a91838d84aa1e
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"
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
Andreas Gampe [Tue, 10 Oct 2017 17:35:55 +0000 (17:35 +0000)]
Merge "Parcel: Avoid NPE in finalization"
am:
b085deece9
Change-Id: I646baf55627a3874a10775846458af5f1dcd5d8c
Treehugger Robot [Tue, 10 Oct 2017 17:20:56 +0000 (17:20 +0000)]
Merge "Parcel: Avoid NPE in finalization"
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
Treehugger Robot [Tue, 10 Oct 2017 16:41:12 +0000 (16:41 +0000)]
Merge "{Event,Security}Log: Unify code"
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: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
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
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)
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:37:08 +0000 (23:37 +0000)]
Merge "EventLog: Check for exception after add()" am:
c30a6ac2f1
am:
f8fa4b8352
Change-Id: Ia9af9320a5b73f1062f7fa0f8cd829602bce4113
Andreas Gampe [Mon, 9 Oct 2017 23:30:04 +0000 (23:30 +0000)]
Merge "EventLog: Check for exception after add()"
am:
c30a6ac2f1
Change-Id: I17768ab21d49afbc943702803293b8cd47804e5c
Treehugger Robot [Mon, 9 Oct 2017 23:15:50 +0000 (23:15 +0000)]
Merge "EventLog: Check for exception after add()"
Andreas Gampe [Mon, 9 Oct 2017 22:58:57 +0000 (22:58 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog" am:
a98866a6b6
am:
a25528b085
Change-Id: Id6e6138b23c962bcd248e12de67e485782bb13aa
Andreas Gampe [Mon, 9 Oct 2017 22:49:04 +0000 (22:49 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog"
am:
a98866a6b6
Change-Id: I42aa318daa851c634531e9b0868437a16a59abdd
Treehugger Robot [Mon, 9 Oct 2017 22:18:25 +0000 (22:18 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog"
Andreas Gampe [Mon, 9 Oct 2017 15:25:36 +0000 (08:25 -0700)]
EventLog: Check for exception after add()
When reading events, calling Collection.add() may result in an
OutOfMemoryError or immutability error. Check for an exception
after the call in EventLog and SecurityLog.
Bug:
67511924
Test: m
Test: Device boots
Change-Id: If0fbf6b01051b5311eeb88d3f52470cd8b1eec59
Andreas Gampe [Mon, 9 Oct 2017 19:01:25 +0000 (12:01 -0700)]
SecurityLog: Apply
7b25bb8 to SecurityLog
Apply logging rewrites from commit
7b25bb8ec79e420e9655a00301cbca80a38cde2d
to SecurityLog.
Test: manual confirm event log messages from services continue
Bug:
31992412
Bug:
31456426
Change-Id: If482a89690fa9fd1da6b5e13398df4bab47ca200
Jordan Liu [Mon, 9 Oct 2017 18:38:50 +0000 (11:38 -0700)]
Add MM#6 string overlay
Change-Id: I004e46cd9a6b911b935b72d8aa584055eded53dd
Fixes:
66983094
Test: manual
Bill Yi [Sun, 8 Oct 2017 22:57:18 +0000 (22:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
2758e3af09 -s ours
am:
748d6e3404 -s ours
Change-Id: I5709f46bc7d85dd8de4a205cb8b7e1aaac71c0f0
Bill Yi [Sun, 8 Oct 2017 22:45:57 +0000 (22:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
2758e3af09 -s ours
Change-Id: I84cd6ad222b419aee8c31c26a07922dd5c7d6746
TreeHugger Robot [Sun, 8 Oct 2017 22:32:15 +0000 (22:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sun, 8 Oct 2017 16:14:18 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Id495007a4f0069772a79e8abbd5e1a8bcfe6db92
Bill Yi [Sun, 8 Oct 2017 14:55:56 +0000 (14:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
1c5bd422fd -s ours
Change-Id: Ib77a48945fd9d889daa7461959749528f2633c3e
TreeHugger Robot [Sun, 8 Oct 2017 14:50:51 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sun, 8 Oct 2017 14:23:44 +0000 (14:23 +0000)]
Import translations. DO NOT MERGE am:
80d87da085 -s ours am:
d250d3aa34 -s ours am:
09e6f1457b -s ours
am:
581e056425 -s ours
Change-Id: Ibda4a53003f1b10c6fb209a8af1cc6c95c8419d5
Bill Yi [Sun, 8 Oct 2017 14:16:28 +0000 (14:16 +0000)]
Import translations. DO NOT MERGE am:
80d87da085 -s ours am:
d250d3aa34 -s ours
am:
09e6f1457b -s ours
Change-Id: I7010ae3bb92d9ec2adaa9eba4509ad2b713ecee7
Bill Yi [Sun, 8 Oct 2017 14:08:20 +0000 (14:08 +0000)]
Import translations. DO NOT MERGE am:
80d87da085 -s ours
am:
d250d3aa34 -s ours
Change-Id: I8b02ede43b1430713761f1ff89c7c864ef6ae4a7
Bill Yi [Sun, 8 Oct 2017 14:00:50 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
80d87da085 -s ours
Change-Id: I7b560ea83669c408725cf2e7d6e1a7c3d7eb191f
Bill Yi [Sun, 8 Oct 2017 12:20:08 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4940cd7a3d5708a6e8091aad241320bf1eb15c8c
Bill Yi [Sun, 8 Oct 2017 07:11:31 +0000 (07:11 +0000)]
Import translations. DO NOT MERGE
am:
87c4d55ccb -s ours
Change-Id: I5884b9fbc3d2385c8aac8fe4612aec6a69ccdcb7
Bill Yi [Sun, 8 Oct 2017 04:49:36 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibfe6303b4d78d1ac0c8a0dbb235c6be683504018
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
OSDN Git Service
