OSDN Git Service
Bernardo Rufino [Tue, 17 Jul 2018 12:46:20 +0000 (12:46 +0000)]
Merge "Increase PerformBackupTask unit coverage"
Martijn Coenen [Tue, 17 Jul 2018 12:20:30 +0000 (12:20 +0000)]
Merge changes I4e06b3f9,Iffcbbb82,If9dd6913
* changes:
Move proxy debug info dumping back to Java.
Dump top binder proxy interface names in dumpsys.
Make BinderProxy @hide public class.
Bernardo Rufino [Thu, 28 Jun 2018 07:30:14 +0000 (08:30 +0100)]
Increase PerformBackupTask unit coverage
With KV Refactor in mind.
* Added tests around empty queue and single package backups.
* Refactored a bit some of the existing tests.
* Moved from mocking BMS to using a real instance and had to adjust a
few things for this.
Test: atest PerformBackupTaskTest
Change-Id: I0ee3be32c7cbac5ed2cdc2717408749907c15ade
David Brazdil [Tue, 17 Jul 2018 11:03:07 +0000 (04:03 -0700)]
Merge changes If285d71a,Iffe5be7c am:
f37950d8c3 am:
c9b5e65747
am:
3efb177ca6
Change-Id: If7f397e4be6ace357f7a563b4546a9a7694fce65
David Brazdil [Tue, 17 Jul 2018 10:56:43 +0000 (03:56 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am:
ed1f171cb9 -s ours am:
dd540c644f -s ours
am:
548c2c0710 -s ours
Change-Id: I2c4c0a33dfd3eb8551f623fad24a078f51759710
TreeHugger Robot [Tue, 17 Jul 2018 10:53:58 +0000 (10:53 +0000)]
Merge "Remove unused line in PrecomputedText"
David Brazdil [Tue, 17 Jul 2018 10:53:35 +0000 (03:53 -0700)]
Merge changes If285d71a,Iffe5be7c am:
f37950d8c3
am:
c9b5e65747
Change-Id: I047358920ecc478de076c32384390ba856bd8c99
David Brazdil [Tue, 17 Jul 2018 10:48:42 +0000 (03:48 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am:
ed1f171cb9 -s ours
am:
dd540c644f -s ours
Change-Id: Ie2115a3f82b78a632dec2c85527755bcb667253a
David Brazdil [Tue, 17 Jul 2018 10:43:13 +0000 (03:43 -0700)]
Merge changes If285d71a,Iffe5be7c
am:
f37950d8c3
Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42
David Brazdil [Tue, 17 Jul 2018 10:37:16 +0000 (03:37 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
am:
ed1f171cb9 -s ours
Change-Id: Ied01c65b3352129d1ced3e41d2ce281077c52d37
Martijn Coenen [Fri, 6 Jul 2018 10:04:48 +0000 (12:04 +0200)]
Move proxy debug info dumping back to Java.
This had to be called from native because serialization
was done from native, but now that serialization is in Java
we can move this back to a more logical place.
Also, this allows us to dump the per-UID proxy counts in
this situation again.
Bug:
109888955
Test: sailfish builds, proxy debug info shown on hitting limits
Change-Id: I4e06b3f93e30ed1c7868ec9e018709a7e796e441
Martijn Coenen [Fri, 6 Jul 2018 09:26:26 +0000 (11:26 +0200)]
Dump top binder proxy interface names in dumpsys.
To facilitate real-time debugging.
Bug:
109888955
Test: builds, adb shell dumpsys activity binder-proxies shows output
Change-Id: Iffcbbb824f4050b6fb8f556c8b4d09115e53da18
David Brazdil [Tue, 17 Jul 2018 08:24:36 +0000 (08:24 +0000)]
Merge changes If285d71a,Iffe5be7c
* changes:
Revert^2: Build dark greylist from public + light grey API
[DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
Martijn Coenen [Mon, 9 Jul 2018 18:22:10 +0000 (20:22 +0200)]
Make BinderProxy @hide public class.
To make some future refactoring easier.
Added some JavaDoc (mostly links to android.os.IBinder)
to make checkstyle happy.
Test: builds
Change-Id: If9dd6913868a34ea1e3d14fee1860a4ff368e06b
Mark Chien [Tue, 17 Jul 2018 07:30:29 +0000 (00:30 -0700)]
Merge "Remove SimChangeListener from Tethering" am:
6e35b2c596 am:
fbab182f44
am:
cd70c87c65
Change-Id: I57f979caab4aaf4e9f6481b27995a49e44ba31d9
Mark Chien [Tue, 17 Jul 2018 07:21:09 +0000 (00:21 -0700)]
Merge "Remove SimChangeListener from Tethering" am:
6e35b2c596
am:
fbab182f44
Change-Id: I7c386065179e8eae8dff0cfbf5227eb259dbb9b9
Mark Chien [Tue, 17 Jul 2018 07:10:56 +0000 (00:10 -0700)]
Merge "Remove SimChangeListener from Tethering"
am:
6e35b2c596
Change-Id: Ie85375b760684bfeb2af0231dbe81592866a4e48
Mark Chien [Tue, 17 Jul 2018 05:49:09 +0000 (05:49 +0000)]
Merge "Remove SimChangeListener from Tethering"
TreeHugger Robot [Tue, 17 Jul 2018 05:46:21 +0000 (05:46 +0000)]
Merge "Make stop complete notification call in to ActivityManager blocking."
TreeHugger Robot [Tue, 17 Jul 2018 03:03:03 +0000 (03:03 +0000)]
Merge "Remove menu container's focus to avoid feedback background"
TreeHugger Robot [Tue, 17 Jul 2018 02:45:52 +0000 (02:45 +0000)]
Merge "Log Wtf when UsageStats missing over a day of events"
TreeHugger Robot [Tue, 17 Jul 2018 02:20:55 +0000 (02:20 +0000)]
Merge "Release wakelock in LocationManagerService if client thread is dead"
Mathieu Chartier [Tue, 17 Jul 2018 01:37:24 +0000 (18:37 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating" am:
600aeb124b -s ours am:
89e9a1ad43 -s ours
am:
e295a0e4e3 -s ours
Change-Id: If1377d662d0c668cef6269f464e496a9566b1c2c
TreeHugger Robot [Tue, 17 Jul 2018 01:33:19 +0000 (01:33 +0000)]
Merge "Menu ime button takes nav button width to show recents button for tablets"
Mathieu Chartier [Tue, 17 Jul 2018 01:28:55 +0000 (18:28 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating" am:
600aeb124b -s ours
am:
89e9a1ad43 -s ours
Change-Id: Ie23f6aae28f3452623523855a030f6fb30a4b6fd
Mathieu Chartier [Tue, 17 Jul 2018 01:22:04 +0000 (18:22 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating"
am:
600aeb124b -s ours
Change-Id: Ib77887238935225bda9457414b9ec5a41e6919d6
Seigo Nonaka [Tue, 17 Jul 2018 01:09:32 +0000 (18:09 -0700)]
Remove unused line in PrecomputedText
Bug: N/A
Test: N/A
Change-Id: I2456116657d8be893a8c477df14a5de490fbaa37
Matthew Ng [Thu, 28 Jun 2018 19:45:26 +0000 (12:45 -0700)]
Remove menu container's focus to avoid feedback background
Menu container contains no icons but holds a few buttons that may appear
later but using a mouse a square background will appear because it has
focus. Remove the focus to remove the feedback background ripple.
Test: use mouse and tap the area right of the home button
Change-Id: If4e57c1a27ca7fbe38712dc1ac6f9e5d2bb76c49
Fixes:
110042464
Yu-Han Yang [Wed, 11 Jul 2018 22:24:11 +0000 (15:24 -0700)]
Release wakelock in LocationManagerService if client thread is dead
- also put a timeout on the wakelock so that it won't be held forever.
Bug:
111321558
Fixes:
111321558
Test: Tested on device.
Change-Id: I36e90f73143ff12d8622dbbb3aad643b283d17ce
TreeHugger Robot [Tue, 17 Jul 2018 00:38:36 +0000 (00:38 +0000)]
Merge "Fix timestamp error in GaugeMetric"
Hall Liu [Tue, 17 Jul 2018 00:30:20 +0000 (17:30 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" am:
fce4acd679 -s ours am:
9818f2599f -s ours
am:
a4480d33e2 -s ours
Change-Id: I2470d095213d72e8a6c96c657778b8d9db66001d
Hall Liu [Tue, 17 Jul 2018 00:19:57 +0000 (17:19 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" am:
fce4acd679 -s ours
am:
9818f2599f -s ours
Change-Id: I72fac0c55e0175256e35a9c12fea6d39c98bf468
Hall Liu [Tue, 17 Jul 2018 00:12:05 +0000 (17:12 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc"""
am:
fce4acd679 -s ours
Change-Id: Id43c6c5c39767964e55b40d62785e3d14d4a4828
Michael Wachenschwanz [Wed, 4 Jul 2018 02:25:32 +0000 (19:25 -0700)]
Log Wtf when UsageStats missing over a day of events
Bug:
110930764
Test: manual (hardcode future time in printLast24HrEvents)
Change-Id: Ia254f7512bfa549966dda3674140772504dbbffd
Mathieu Chartier [Mon, 16 Jul 2018 23:16:13 +0000 (23:16 +0000)]
Merge "old paths contains all entries when updating"
TreeHugger Robot [Mon, 16 Jul 2018 22:55:40 +0000 (22:55 +0000)]
Merge "Disable tests failing with ICU62"
Hall Liu [Mon, 16 Jul 2018 22:52:10 +0000 (22:52 +0000)]
Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc"""
Yao Chen [Mon, 16 Jul 2018 22:39:18 +0000 (15:39 -0700)]
Fix timestamp error in GaugeMetric
Bug:
111516208
Test: unit tests pass, manually tested too
Change-Id: Ia268d3a38c331daab0f96c33461bb7dc794ce610
Todd Kennedy [Mon, 16 Jul 2018 21:31:10 +0000 (14:31 -0700)]
Merge "Loosen resource file verification" into pi-dev am:
cf0b127110
am:
60413d0697
Change-Id: I95400ba3a885605bc52df10968ef2b4adf7f90a6
Robert Shih [Mon, 16 Jul 2018 21:20:21 +0000 (14:20 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258 am:
dccb62bcca am:
64cb4be887 am:
c450d1401e
am:
deb8dbad23
Change-Id: I15c3a600ff4e4802254bb41d4903eec10583febc
Todd Kennedy [Mon, 16 Jul 2018 21:15:09 +0000 (14:15 -0700)]
Merge "Loosen resource file verification" into pi-dev
am:
cf0b127110
Change-Id: I0b4012085579aa172a1a3f5a83325f0827523af5
Amith Yamasani [Mon, 16 Jul 2018 21:00:20 +0000 (14:00 -0700)]
Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev am:
632c036d8c
am:
9d629c85fd
Change-Id: I9760ced42479a795c03ecefd24ed6b7597294421
Robert Shih [Mon, 16 Jul 2018 20:58:38 +0000 (13:58 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258 am:
dccb62bcca am:
64cb4be887
am:
c450d1401e
Change-Id: I7aba9ed971773ac2ea8cc7df5fe42ed9c022a5ab
TreeHugger Robot [Mon, 16 Jul 2018 20:57:43 +0000 (20:57 +0000)]
Merge "Loosen resource file verification" into pi-dev
Todd Kennedy [Thu, 12 Jul 2018 20:15:54 +0000 (13:15 -0700)]
Loosen resource file verification
Bug:
77808145
Test: Tried to install corrupt APK prior to the change, install failed
Test: Tried to install corrupt APK after the change, install succeeded
Test: atest CtsAppSecurityHostTestCases:CorruptApkTests
Change-Id: I19a69e52a17c1080beaf2cc575c32f564b1033a3
Robert Shih [Mon, 16 Jul 2018 20:38:43 +0000 (13:38 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258 am:
dccb62bcca
am:
64cb4be887
Change-Id: Id7d4599c5d7d7c803e86afa88be582773c80741f
Amith Yamasani [Mon, 16 Jul 2018 20:38:23 +0000 (13:38 -0700)]
Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev
am:
632c036d8c
Change-Id: I1f76c36d330c50b17fc6df35ffb014e3e97e3640
Felipe Leme [Mon, 16 Jul 2018 20:33:36 +0000 (13:33 -0700)]
Fixed test case.
Bug:
111346876
Test: m -j FrameworksServicesTests && \
adb install -r -t -g \
${OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && \
adb shell am instrument -e class \
"com.android.server.locksettings.LockSettingsShellCommandTest" \
-w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Change-Id: I8ad425cb9777934b14eaf3c738411beed0357c99
Seigo Nonaka [Mon, 16 Jul 2018 20:32:24 +0000 (13:32 -0700)]
Disable tests failing with ICU62
Bug:
111299224
Test: atest android.text.method.ForwardDeleteTest
Change-Id: Ic872c632a68a31c3fee2916d0ff4fce83b76eff6
Robert Shih [Mon, 16 Jul 2018 20:13:13 +0000 (13:13 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258
am:
dccb62bcca
Change-Id: I9e6762b25f001e31da7df0bb25984856989b9fd9
Christopher Morin [Mon, 16 Jul 2018 20:06:05 +0000 (20:06 +0000)]
Merge "Reland "OOM score management""
TreeHugger Robot [Mon, 16 Jul 2018 20:04:23 +0000 (20:04 +0000)]
Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev
Robert Shih [Mon, 16 Jul 2018 19:51:28 +0000 (12:51 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev
am:
e43837e258
Change-Id: Ib0ef741f0188ff3e6edc52e20eae997e9dba56e4
Chong Zhang [Mon, 16 Jul 2018 19:33:46 +0000 (12:33 -0700)]
Merge "Fix broken javadoc link in MediaFormat" into pi-dev am:
15ae72085f
am:
741bcbee62
Change-Id: I87362a09b014b48ca1d8317d59bd355064cb463f
Chong Zhang [Mon, 16 Jul 2018 19:25:32 +0000 (12:25 -0700)]
Merge "Fix broken javadoc link in MediaFormat" into pi-dev
am:
15ae72085f
Change-Id: Id7af6bea28f60e93ce1a1cce94f053b9484ceb37
TreeHugger Robot [Mon, 16 Jul 2018 19:25:14 +0000 (19:25 +0000)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev
* changes:
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675 am:
d6143e9307
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc
Fix TrackInfo parcel write
Felipe Leme [Mon, 16 Jul 2018 19:23:02 +0000 (19:23 +0000)]
Merge "Implemented help for lock_settings Shell command."
Chong Zhang [Mon, 16 Jul 2018 19:12:32 +0000 (19:12 +0000)]
Merge "Fix broken javadoc link in MediaFormat" into pi-dev
TreeHugger Robot [Mon, 16 Jul 2018 19:04:30 +0000 (19:04 +0000)]
Merge "Let LocaleInfo implements Serializable"
Todd Kennedy [Wed, 2 May 2018 09:59:45 +0000 (10:59 +0100)]
old paths contains all entries when updating
In certains circumstances, only the base and split APKs were included in
the "old paths" list when updating the application info. Instead, this
list should contain _all_ elements, including any additional libraries
that may be added to the overall classpath.
Bug:
77342775
Bug:
80337129
Test: Manual. Install a package. Install a split with --dont_kill. See that the path doesn't contain duplicate entries
Test: Uninstall GMS updates and reinstall. Verify that GMS Dex files aren't extrated out of the APK.
(cherry picked from commit
b9656a93aac435cefaa4ca0e1b06495d690ba019)
Merged-In: Id9739cce215ab07bff1b17966583c0cf51a0b34a
Change-Id: I3c61b1b61dc1ab8a1a51a5be68f19ae9af586692
Jeff Sharkey [Mon, 16 Jul 2018 16:49:12 +0000 (16:49 +0000)]
Merge "GROUP BY and HAVING aren't ready to be strict."
Jeff Sharkey [Mon, 16 Jul 2018 16:43:43 +0000 (10:43 -0600)]
GROUP BY and HAVING aren't ready to be strict.
Despite SQLite documentation saying these clauses follow the "expr"
syntax, queries will fail with obscure "row value misused" errors,
so remove the strict enforcement for now.
Test: manual
Bug:
111480817
Change-Id: Ib8cdcb4e6456110589203189fcfa14e75cd68718
TreeHugger Robot [Mon, 16 Jul 2018 16:10:23 +0000 (16:10 +0000)]
Merge "No longer create a GrVkInterface in the VulkanManger."
Derek Sollenberger [Mon, 16 Jul 2018 15:49:42 +0000 (15:49 +0000)]
Merge "TextView setOverlappingRendering must be true when shadows are used."
markchien [Mon, 16 Jul 2018 11:54:26 +0000 (19:54 +0800)]
Remove SimChangeListener from Tethering
SimChangeListener is obsolete. It is replace by
ACTION_CARRIER_CONFIG_CHANGED.
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes (with --no-hidden-api-checks)
- tethering/hotspot on/off
Bug:
111490073
Change-Id: I82644ea136f43869a953a1f7b72dc489fe90f380
Neil Fuller [Mon, 16 Jul 2018 09:09:18 +0000 (02:09 -0700)]
Merge "Avoid use of DateUtilsBridge.icuTimeZone()" am:
e859c42e23 am:
25fd54f6f3
am:
3208539011
Change-Id: Ib45c4fd371c9b4b4ab97973eddfd49101c353cc3
Neil Fuller [Mon, 16 Jul 2018 08:58:14 +0000 (01:58 -0700)]
Merge "Avoid use of DateUtilsBridge.icuTimeZone()" am:
e859c42e23
am:
25fd54f6f3
Change-Id: I0083ddcadbc391a26ae8d264f8626bdf3b8f988f
Neil Fuller [Mon, 16 Jul 2018 08:50:04 +0000 (01:50 -0700)]
Merge "Avoid use of DateUtilsBridge.icuTimeZone()"
am:
e859c42e23
Change-Id: I6b6452f9609d88ce61959e7c4ae4f0fd8fa97e64
Neil Fuller [Mon, 16 Jul 2018 07:44:58 +0000 (07:44 +0000)]
Merge "Avoid use of DateUtilsBridge.icuTimeZone()"
Jack Yu [Mon, 16 Jul 2018 02:55:42 +0000 (19:55 -0700)]
Merge "Added documentation for network registration state" am:
3c1604da8b am:
5e7bbe01c4
am:
1d4b1172fe
Change-Id: I2ccc907907029368eec5f4c7cdcaa25eb4c62b16
Jack Yu [Mon, 16 Jul 2018 02:48:50 +0000 (19:48 -0700)]
[automerger skipped] Reordered the params for network registration
am:
ccd62f2295 -s ours
Change-Id: I82023b200f07f2e1fe60c0f94616078026cffda7
Jack Yu [Mon, 16 Jul 2018 02:47:08 +0000 (19:47 -0700)]
Merge "Added documentation for network registration state" am:
3c1604da8b
am:
5e7bbe01c4
Change-Id: I3a24338b43b6f1f9a704bbed1e2d472bb2a9c574
Jack Yu [Sat, 9 Jun 2018 00:27:05 +0000 (17:27 -0700)]
Reordered the params for network registration
Test: Build
Bug:
73659459
Merged-In: I1af2c49a937177173b760d30b030da20f03c01d7
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit
7928c4d1c370a67be81ccb5b70696b8ef9db48ba)
(cherry picked from commit
c683c3930e6d03825fd80fa71a2b3d5de5639f7d)
(cherry picked from commit
d6284d9e0a22de09eb07ee00567cec5e7b01b433)
Jack Yu [Mon, 16 Jul 2018 00:12:41 +0000 (17:12 -0700)]
Merge "Added documentation for network registration state"
am:
3c1604da8b
Change-Id: Icf8f0fff21c1190d3bde21cdbe378d6b75b51506
Treehugger Robot [Sun, 15 Jul 2018 22:34:30 +0000 (22:34 +0000)]
Merge "Added documentation for network registration state"
Jeff Sharkey [Sat, 14 Jul 2018 21:35:29 +0000 (21:35 +0000)]
Merge "Extend SQLiteQueryBuilder for update and delete."
TreeHugger Robot [Sat, 14 Jul 2018 09:45:12 +0000 (09:45 +0000)]
Merge "Definition of GenericAtom"
Chih-hung Hsieh [Sat, 14 Jul 2018 04:48:50 +0000 (21:48 -0700)]
Merge "Fix unnecessary copy initialization warnings" am:
38858d6dd3 am:
d5de710016
am:
775cdc3019
Change-Id: I1ffad4d441e1a331e06ae778bf51dd41e5fecac2
Chih-hung Hsieh [Sat, 14 Jul 2018 04:23:02 +0000 (21:23 -0700)]
Merge "Fix unnecessary copy initialization warnings" am:
38858d6dd3
am:
d5de710016
Change-Id: Ie86ab05432cfde69464cfeb3341248dd6b18675e
Jack Yu [Sat, 14 Jul 2018 04:20:21 +0000 (21:20 -0700)]
[automerger skipped] Reordered the params for network registration am:
d6284d9e0a -s ours
am:
3c69d029bc -s ours
Change-Id: I6278782b9a4cae83e468bf2ebe7ed8f56f3a10cd
Chih-hung Hsieh [Sat, 14 Jul 2018 04:13:18 +0000 (21:13 -0700)]
Merge "Fix unnecessary copy initialization warnings"
am:
38858d6dd3
Change-Id: Ic96829517269abfdb9fbf1661deffe0758356d57
Jack Yu [Sat, 14 Jul 2018 04:09:56 +0000 (21:09 -0700)]
[automerger skipped] Reordered the params for network registration
am:
d6284d9e0a -s ours
Change-Id: I29fc2270df41e5c401d78820feb92dce4f015bba
TreeHugger Robot [Sat, 14 Jul 2018 03:07:29 +0000 (03:07 +0000)]
Merge "Better Handling of Battery Stats History Overflow"
TreeHugger Robot [Sat, 14 Jul 2018 02:35:27 +0000 (02:35 +0000)]
Merge "Fix typo in metrics constant"
TreeHugger Robot [Sat, 14 Jul 2018 02:08:40 +0000 (02:08 +0000)]
Merge "Make ENABLE_COPY_OPTIMIZATIONS non final."
Android Build Merger (Role) [Sat, 14 Jul 2018 01:21:02 +0000 (01:21 +0000)]
Merge "Merge "Re-Number RIL Message IDs to Match RIL.h" am:
8424001a04 am:
f448662744 am:
c8fde9f310"
TreeHugger Robot [Sat, 14 Jul 2018 01:20:42 +0000 (01:20 +0000)]
Merge "AAPT2: Fix long version code bugs"
Nathan Harold [Sat, 14 Jul 2018 01:20:41 +0000 (18:20 -0700)]
Merge "Re-Number RIL Message IDs to Match RIL.h" am:
8424001a04 am:
f448662744
am:
c8fde9f310
Change-Id: I509f8984ccb60cf9264922cee596b2883f566b1e
TreeHugger Robot [Sat, 14 Jul 2018 01:20:37 +0000 (01:20 +0000)]
Merge "passpoint-r1: fix the wrong filed for PPS-MO."
Kevin Chyn [Sat, 14 Jul 2018 00:48:50 +0000 (17:48 -0700)]
Fix typo in metrics constant
Fixes:
111453449
Test: builds
Change-Id: Ic416d8f18b86236ba15b075d5ffd6325381ea39f
Tyler Gunn [Sat, 14 Jul 2018 01:12:45 +0000 (18:12 -0700)]
Merge "Update InCallService API docs to explain how to show incoming call UI." am:
ac47c63b36 am:
0bd810f5ea
am:
ba70f0803a
Change-Id: I240e0aa8158a83e5964febd9b28171194bb35da9
TreeHugger Robot [Sat, 14 Jul 2018 00:59:37 +0000 (00:59 +0000)]
Merge "Making timerfd non-blocking in alarm manager."
Jorim Jaggi [Sat, 14 Jul 2018 00:47:13 +0000 (17:47 -0700)]
[automerger skipped] Merge "Pin compiled code of HOME app" into pi-dev am:
0e5e46f874
am:
5439a6ea84 -s ours
Change-Id: Idede8a84e1173ca21c24b166bd45a014e597cda8
TreeHugger Robot [Sat, 14 Jul 2018 00:36:30 +0000 (00:36 +0000)]
Merge "Add system property for turn on system audio control when power on device."
Hall Liu [Sat, 14 Jul 2018 00:30:49 +0000 (00:30 +0000)]
Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""
This reverts commit
0082b161ca42b41925fd5973f1779fc4c46f6034.
Reason for revert: build breaks fixed
Change-Id: I75ea63ceaae6e970ce51a971c9a4635d0ce3f9e4
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Hui Yu [Thu, 21 Jun 2018 02:07:56 +0000 (19:07 -0700)]
Better Handling of Battery Stats History Overflow
Previously battery history is kept in the in-memory mHistoryBuffer
with size of 512KB (96KB on low memory device). When the buffer is
close to full we drop certain types of history. When the buffer is
full the whole buffer is reset and we lost elder history. On a
device with long battery life this problem is more frequent.
This CL changes mHistoryBuffer to 128KB (64KB on low memory device).
When the buffer is full, it is saved to history file on file system.
By default we allow 32 history files (64 history files on low-memory
device) which gives us 4MB history (compare to 512KB today).
The MAX_HISTORY_BUFFER and MAX_HISTORY_FILES can be remote configured
through GServices or P/H.
In case of history exceeding 4MB, the oldest history file is deleted
and new history file is open.
This change increases battery history by using disk file and the
chance of losing history is greatly reduced.
Bug:
67297625
Test: adb shell dumpsys batterystats --history
Change-Id: Id9aafea761649d7323b97d1e44135f7880a95414
Nathan Harold [Sat, 14 Jul 2018 00:30:59 +0000 (17:30 -0700)]
Merge "Re-Number RIL Message IDs to Match RIL.h" am:
8424001a04
am:
f448662744
Change-Id: I98eb865f45fd608d4d8f73ce3bc8a9afa26bd2d2
Jack Yu [Sat, 9 Jun 2018 00:27:05 +0000 (17:27 -0700)]
Reordered the params for network registration
Test: Build
Bug:
73659459
Merged-In: I1af2c49a937177173b760d30b030da20f03c01d7
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit
7928c4d1c370a67be81ccb5b70696b8ef9db48ba)
(cherry picked from commit
c683c3930e6d03825fd80fa71a2b3d5de5639f7d)
Tyler Gunn [Sat, 14 Jul 2018 00:20:45 +0000 (17:20 -0700)]
Merge "Update InCallService API docs to explain how to show incoming call UI." am:
ac47c63b36
am:
0bd810f5ea
Change-Id: I649bdb38348a507c5c01d66d99df0c6d6f5dcd6f
Jorim Jaggi [Sat, 14 Jul 2018 00:13:14 +0000 (17:13 -0700)]
Merge "Pin compiled code of HOME app" into pi-dev
am:
0e5e46f874
Change-Id: I205971bc6c8309fc4ad40b4a4677703adecf4a75