OSDN Git Service
Dan Willemsen [Wed, 18 Oct 2017 06:24:45 +0000 (06:24 +0000)]
Merge "Use soong_ui directly, instead of make" am:
e994b4b584 am:
0531e5c647
am:
98fc198f1f
Change-Id: Id17adee4b02cc499261f88c3faed15d889f5b6c3
Dan Willemsen [Wed, 18 Oct 2017 06:17:09 +0000 (06:17 +0000)]
Merge "Use soong_ui directly, instead of make" am:
e994b4b584
am:
0531e5c647
Change-Id: Ic3fc61824852181512f941dbc57c158540546616
Dan Willemsen [Wed, 18 Oct 2017 06:10:06 +0000 (06:10 +0000)]
Merge "Use soong_ui directly, instead of make"
am:
e994b4b584
Change-Id: I406a02af2d5fd1accf5c53609af00f416669e18f
Dan Willemsen [Wed, 18 Oct 2017 06:00:51 +0000 (06:00 +0000)]
Merge "Use soong_ui directly, instead of make"
Adam Lesinski [Wed, 18 Oct 2017 00:57:26 +0000 (00:57 +0000)]
Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" into oc-mr1-dev
am:
3bdfe1a251
Change-Id: I3295e61dcf29a7cb242b4ee0017f2fd94a0cfd65
Dan Willemsen [Wed, 18 Oct 2017 00:46:41 +0000 (17:46 -0700)]
Use soong_ui directly, instead of make
This will use ckati instead of make for dumping variables, for
consistent makefile parsing. It may also sandbox executions, etc.
Also skip the legacy make wrapper to build, and use soong_ui instead.
The command line arguments are equivalent, but -j is no longer
necessary, we'll default to a sane value.
Test: bit -b framework
Change-Id: Idc2c9d1abe84b6b783b8702925de5493d47a4509
TreeHugger Robot [Wed, 18 Oct 2017 00:51:00 +0000 (00:51 +0000)]
Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" into oc-mr1-dev
Winston Man [Tue, 17 Oct 2017 23:37:59 +0000 (23:37 +0000)]
Update build target to restrict it to arm and x86 only
am:
50365007b6
Change-Id: If461907f6f797e5fda72ef47147594a4ed7f41a9
Adam Lesinski [Fri, 13 Oct 2017 19:40:37 +0000 (12:40 -0700)]
AAPT2: Flatten AndroidManifest.xml stringpool in UTF16
A few OEM devices have introduced a memory corruption bug
that is only triggered when an application's AndroidManifest.xml
uses UTF8 string pools. Workaround this by only encoding
AndroidManifest.xml with UTF16 strings.
Bug:
64434571
Test: manual
Change-Id: I2ee50d1b2b5942d971ef2a544c878de63f67c652
Jordan Liu [Tue, 17 Oct 2017 21:36:11 +0000 (21:36 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog" am:
d32138d78a am:
a0df3496d3
am:
4025ccb0a1
Change-Id: Ida23475584fb0324ce12af05af422230b170b1a4
Jordan Liu [Tue, 17 Oct 2017 21:15:19 +0000 (21:15 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog" am:
d32138d78a
am:
a0df3496d3
Change-Id: Ic13004cc1c9afa5474df291211333e215ad96424
Jordan Liu [Tue, 17 Oct 2017 21:06:58 +0000 (21:06 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog"
am:
d32138d78a
Change-Id: I0bb3388b4f2e0243049316c3548aacf6f034ffd2
Jordan Liu [Tue, 17 Oct 2017 20:58:01 +0000 (20:58 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog"
Winston Man [Tue, 17 Oct 2017 20:24:31 +0000 (21:24 +0100)]
Update build target to restrict it to arm and x86 only
This is to address build breakage for MIPS
https://android-build.googleplex.com/builds/submitted/
4400887/sdk_phone_mips-sdk_mac/latest/logs
Bug:
64504762
Test: build successful with target marlin-eng (arm), gce_x86_phone (x86) and sdk_phone_mips (mips)
Change-Id: I710c823ae235d0650b4d1a018180b552261aecc5
Zhi An Ng [Tue, 17 Oct 2017 20:16:02 +0000 (20:16 +0000)]
Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev
am:
d3dc9171d4
Change-Id: I6bf6797bdf92bfef0f4f8e23a394eaa7646460c0
Tom Cherry [Tue, 17 Oct 2017 20:04:51 +0000 (20:04 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get" am:
c589496ce9 am:
b72c0626f5
am:
16e676be4b
Change-Id: Ie43c9ec866feba876016c8ceb4c1e5d6222f0a18
TreeHugger Robot [Tue, 17 Oct 2017 20:02:19 +0000 (20:02 +0000)]
Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev
Bookatz [Tue, 17 Oct 2017 19:58:08 +0000 (19:58 +0000)]
Merge "Batterystats handles nested unoptimized ble scans" am:
4627c01ee4 -s ours am:
2fd6b1d7cd -s ours
am:
9fccdd14e5 -s ours
Change-Id: I593da51c7664d76c1ad64859823d434f4ce414fa
Tom Cherry [Tue, 17 Oct 2017 19:47:57 +0000 (19:47 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get" am:
c589496ce9
am:
b72c0626f5
Change-Id: Ib0561d4ce3e027b2021bc6105f0be03ba6fffa99
Tom Cherry [Tue, 17 Oct 2017 19:37:45 +0000 (19:37 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get"
am:
c589496ce9
Change-Id: Ibef1415adec0dac324b0531b7038640c3584fdf1
Bookatz [Tue, 17 Oct 2017 19:35:22 +0000 (19:35 +0000)]
Merge "Batterystats handles nested unoptimized ble scans" am:
4627c01ee4 -s ours
am:
2fd6b1d7cd -s ours
Change-Id: Iaad1877f6fbdee2beaa2328a3b3ee5025c468426
Tom Cherry [Tue, 17 Oct 2017 19:28:07 +0000 (19:28 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get"
Bookatz [Tue, 17 Oct 2017 19:24:40 +0000 (19:24 +0000)]
Merge "Batterystats handles nested unoptimized ble scans"
am:
4627c01ee4 -s ours
Change-Id: I044d02d6b00f63573870643ad83fce11740dd498
Treehugger Robot [Tue, 17 Oct 2017 19:03:52 +0000 (19:03 +0000)]
Merge "Batterystats handles nested unoptimized ble scans"
Winston Man [Tue, 17 Oct 2017 17:49:05 +0000 (17:49 +0000)]
Merge "Update pre-built apks in platform" into oc-mr1-dev
am:
69780830e5
Change-Id: I73a727dc39e0d2be1d47afeef1305362b13ffbc4
Winston Man [Tue, 17 Oct 2017 17:33:50 +0000 (17:33 +0000)]
Merge "Update pre-built apks in platform" into oc-mr1-dev
Winston Man [Mon, 16 Oct 2017 09:33:03 +0000 (10:33 +0100)]
Update pre-built apks in platform
Now include arm and x86 apks from built server
CtsShim (8.1.0-
4396705)
./packages/CtsShim/apk/arm/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
./packages/CtsShim/apk/arm/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
./packages/CtsShim/apk/x86/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
./packages/CtsShim/apk/x86/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
Built here:
https://android-build.googleplex.com/builds/branch-dashboard/ub-ctsshim-dev?build_id=
4396705
Final OC-MR1 drop for Oct 19th.
This build IS suitable for public release.
Bug:
64504762
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PrivilegedUpdateTests
Test: gts-tradefed run commandAndExit gts-dev --module GtsPackageManagerHostTestCases
Change-Id: I9a439f7287a8d3703cf014c7c03df2348a384a80
Mathieu Chartier [Tue, 17 Oct 2017 16:53:35 +0000 (16:53 +0000)]
Merge "DO NOT MERGE: Add extra compiled classes" into oc-mr1-dev
am:
1d1ff0b030
Change-Id: I588c1a5d59a5e3455d6c19dfcb18b9ff59283e15
Mathieu Chartier [Tue, 17 Oct 2017 16:35:38 +0000 (16:35 +0000)]
Merge "DO NOT MERGE: Add extra compiled classes" into oc-mr1-dev
Tom Cherry [Tue, 17 Oct 2017 16:20:01 +0000 (09:20 -0700)]
Frameworks: Remove warning for SystemProperties.get
We now disallow non-UTF8 property values directly in property_service,
so there is no need for this warning.
This partially reverts
33aea8d40e6cc99f7968a6c6605a81a4587b85e7.
Bug:
63177684
Test: make
Change-Id: I61f49f635c6095013f55b906e00925a8cbd1ea8c
DongYuchen [Thu, 16 Feb 2017 10:22:36 +0000 (18:22 +0800)]
Add config to skip showing CF fail-to-disable dialog
Add config to skip showing CF fail-to-disable dialog. Because it is not
always correct to show fail-to-disable dialog. It depends on the way
of NW CF handling. The default value is set to false.
Test: manual - checked the call forwarding fail dialog was not shown
Bug:
35790386
Change-Id: I8b0e3d15736d95df8fcac205cb9a3ef2f8579988
Sooraj Sasindran [Tue, 17 Oct 2017 06:29:22 +0000 (06:29 +0000)]
Merge "Enhance network scan request" am:
b9f49e671a am:
d5987f9722
am:
c1333187cd
Change-Id: I8a9d698e2b8be06ffa8433dbdce81e673130cde8
Sooraj Sasindran [Tue, 17 Oct 2017 06:19:46 +0000 (06:19 +0000)]
Merge "Enhance network scan request" am:
b9f49e671a
am:
d5987f9722
Change-Id: Ifb781febbb687036b15746f809499788b802566b
Sooraj Sasindran [Tue, 17 Oct 2017 06:11:06 +0000 (06:11 +0000)]
Merge "Enhance network scan request"
am:
b9f49e671a
Change-Id: If24d4740c346761391213f94647c43cbd742444a
Sooraj Sasindran [Tue, 17 Oct 2017 06:03:31 +0000 (06:03 +0000)]
Merge "Enhance network scan request"
Calin Juravle [Tue, 17 Oct 2017 05:28:08 +0000 (05:28 +0000)]
Merge "Revert "When updating a split app, copy compiled files from base.apk only."" am:
154535317e am:
4a69261500
am:
f3ef1f09ef
Change-Id: I0fff716c3dcc1ce699666b4cd0794930c188400b
Hall Liu [Tue, 17 Oct 2017 05:22:19 +0000 (05:22 +0000)]
Merge "Add null checks to EMBMS AIDL impls" am:
9e93a6515e am:
7bfd87f169
am:
38088cbca2
Change-Id: Ie162853f505c6cebc429805e1839227901d13276
Zhi An Ng [Mon, 16 Oct 2017 23:03:22 +0000 (23:03 +0000)]
DO NOT MERGE Revert "Show dialog if top app is killed by lmk"
This reverts commit
84a2e2a06bb95e9c30f10a77d0fb90386b0f470d.
Comments in ag/
3029299 for more details. This revert is dependent on another revert ag/
3074066, which has been merged.
Reason for revert: No mechanism to check if an app is killed because of low memory killer
Bug:
65488249
Test: manual
Change-Id: I2940a5b9f22f3428432537acbf64a10f81b0b9d0
Siyamed Sinir [Tue, 17 Oct 2017 03:27:04 +0000 (03:27 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-mr1-dev
am:
5182f884f2
Change-Id: Iba84de809f74507587077857e2067f83ad28b313
Siyamed Sinir [Tue, 17 Oct 2017 01:11:57 +0000 (01:11 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-mr1-dev
Zhi An Ng [Mon, 16 Oct 2017 23:40:39 +0000 (23:40 +0000)]
Merge "Revert "Only show dialog if top app is killed"" into oc-mr1-dev
am:
d6065d16e1
Change-Id: I1805d33f31dc73a266f13a956c67549ef39ec2a6
Mathieu Chartier [Mon, 16 Oct 2017 23:34:21 +0000 (23:34 +0000)]
Merge "Move stub APK profile logic to performDexOptUpgrade" into oc-mr1-dev
am:
4f1844cb2d
Change-Id: I09c82246b6f61045c2e1911f96f995d309ea4978
Bookatz [Tue, 11 Jul 2017 23:49:17 +0000 (16:49 -0700)]
Batterystats handles nested unoptimized ble scans
When a ble scan starts, it tells batterystats whether that scan is
unoptimized. When the scan stops, batterystats is not informed of
whether the stopped scan was unoptimized. Because the ble scan call
could not be nested (couldn't call start twice without stopping first),
this was fine, but now nesting is possible, so batterystats needs to
know whether the stopped ble scan is unoptimized.
Bug:
63456783
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: no new errors when run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testUnoptimizedBleScans
Change-Id: Ia73f294cf1807ddaf20f1c0bcc28add001cac78c
Merged-In: Ia73f294cf1807ddaf20f1c0bcc28add001cac78c
(cherry picked from commit
94c5a313d7313a9a88abdf4267af43b87deb0dd2)
Calin Juravle [Mon, 16 Oct 2017 23:11:10 +0000 (23:11 +0000)]
Merge "Revert "When updating a split app, copy compiled files from base.apk only."" am:
154535317e
am:
4a69261500
Change-Id: Icdd830af8054f0540e91afe739d794d35178db4c
TreeHugger Robot [Mon, 16 Oct 2017 23:00:29 +0000 (23:00 +0000)]
Merge "Revert "Only show dialog if top app is killed"" into oc-mr1-dev
Hall Liu [Mon, 16 Oct 2017 22:58:43 +0000 (22:58 +0000)]
Merge "Add null checks to EMBMS AIDL impls" am:
9e93a6515e
am:
7bfd87f169
Change-Id: I814c6e5a9032c6a28c2b3087311d6c51647e0bc4
Calin Juravle [Mon, 16 Oct 2017 22:51:45 +0000 (22:51 +0000)]
Merge "Revert "When updating a split app, copy compiled files from base.apk only.""
am:
154535317e
Change-Id: Ia91f126900e3c52016af233f33c47b0a3c38d111
Hall Liu [Mon, 16 Oct 2017 22:44:48 +0000 (22:44 +0000)]
Merge "Add null checks to EMBMS AIDL impls"
am:
9e93a6515e
Change-Id: I888b5772fca069b638f1c2d0f803cf3863b7ff85
Mathieu Chartier [Mon, 16 Oct 2017 17:54:56 +0000 (10:54 -0700)]
DO NOT MERGE: Add extra compiled classes
Since compiled were not updated for MR1, this change incrementally
adds missing classes based on the typical use cases.
The reason that we only use boot image profiles in MR1 for Go is
because of risk concerns.
Generated with a threshold of 3.
Bug:
67730245
Test: make and flash
Change-Id: I9597bcec521514fdbf69521ef0e23a2d7ddcf656
Calin Juravle [Mon, 16 Oct 2017 22:26:06 +0000 (22:26 +0000)]
Merge "Revert "When updating a split app, copy compiled files from base.apk only.""
Hall Liu [Mon, 16 Oct 2017 22:04:17 +0000 (22:04 +0000)]
Merge "Add null checks to EMBMS AIDL impls"
TreeHugger Robot [Mon, 16 Oct 2017 21:33:03 +0000 (21:33 +0000)]
Merge "Move stub APK profile logic to performDexOptUpgrade" into oc-mr1-dev
Zhi An Ng [Mon, 16 Oct 2017 20:38:00 +0000 (20:38 +0000)]
Revert "Only show dialog if top app is killed"
This reverts commit
90024acefeed782ff89a6004802715529d5a189d.
Commens in ag/
3029299 for more details.
After this is reverted, ag/
2891284 will need to be reverted (for oc-mr1-dev),
and ag/
2961224 for master).
Reason for revert: No mechanism to check if an app is killed because of low memory killer
Change-Id: I4aeef4f3008280a34f0b898ed7a2da37be006a84
Bug:
65488249
Jason Monk [Mon, 16 Oct 2017 20:02:52 +0000 (20:02 +0000)]
Merge "Auto-dim refinements" into oc-mr1-dev
am:
2806975bfb
Change-Id: Ica3ebd5b227fbe9e4bd4b3699f54176d166f6dda
Chih-hung Hsieh [Mon, 16 Oct 2017 19:50:38 +0000 (19:50 +0000)]
Merge "Use -Werror in frameworks/base" am:
16fbd3a1d8 am:
0bfb717a37
am:
9f004b1752
Change-Id: I6517ee1689b0247caf830a6c3528bfa9bcf91f75
TreeHugger Robot [Mon, 16 Oct 2017 19:37:31 +0000 (19:37 +0000)]
Merge "Auto-dim refinements" into oc-mr1-dev
Chih-hung Hsieh [Mon, 16 Oct 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Use -Werror in frameworks/base" am:
16fbd3a1d8
am:
0bfb717a37
Change-Id: I106827dd37a33cfcd956b2a1a3e48bd09576eadb
Andrii Kulian [Mon, 16 Oct 2017 19:35:20 +0000 (19:35 +0000)]
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev
am:
96da027196
Change-Id: I9f263b5fb407dca34d9ba6d60c7296377b7f44bc
Chih-hung Hsieh [Mon, 16 Oct 2017 19:24:53 +0000 (19:24 +0000)]
Merge "Use -Werror in frameworks/base"
am:
16fbd3a1d8
Change-Id: Iab69cf4f99cf4bedd12eb7764c773a893bfe5343
Chih-hung Hsieh [Mon, 16 Oct 2017 19:13:22 +0000 (19:13 +0000)]
Merge "Use -Werror in frameworks/base"
nharold [Mon, 16 Oct 2017 19:04:36 +0000 (19:04 +0000)]
Merge "Remove getNetworkType() from ServiceState" am:
ce1f9afb84 am:
7edf405cdd
am:
a550f85f84
Change-Id: If5c714452e56f76bf6f9629444469fda2d45be93
TreeHugger Robot [Mon, 16 Oct 2017 18:56:49 +0000 (18:56 +0000)]
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev
nharold [Mon, 16 Oct 2017 18:52:15 +0000 (18:52 +0000)]
Merge "Remove getNetworkType() from ServiceState" am:
ce1f9afb84
am:
7edf405cdd
Change-Id: I0782f2db112fb1c0e404dc01e9a401268523ad39
nharold [Mon, 16 Oct 2017 18:41:22 +0000 (18:41 +0000)]
Merge "Remove getNetworkType() from ServiceState"
am:
ce1f9afb84
Change-Id: I8e09f9060c7066e99428ea395743f66924443488
nharold [Mon, 16 Oct 2017 18:30:01 +0000 (18:30 +0000)]
Merge "Remove getNetworkType() from ServiceState"
Mathieu Chartier [Mon, 16 Oct 2017 18:02:36 +0000 (18:02 +0000)]
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev
am:
2baa393238
Change-Id: I5c35bae390870d6582d863e16013afb897117d0b
Mathieu Chartier [Mon, 16 Oct 2017 17:49:09 +0000 (17:49 +0000)]
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev
Fyodor Kupolov [Thu, 12 Oct 2017 18:22:57 +0000 (11:22 -0700)]
Use calling user ID when calling isDeviceLocked
If isDeviceLocked is called with clearCallingIdentity,
original userId should be explicitly passed
Bug:
67621847
Test: Manual
Change-Id: I2bcb92572898811cc96bda1149ef806e6239e929
Jason Monk [Fri, 13 Oct 2017 14:34:40 +0000 (10:34 -0400)]
Auto-dim refinements
- Don't auto-dim while wallpaper is showing
- Up alpha to 60%
Change-Id: Ie5fc33279ca46f7de37befacbbd7b42b7d4e5d15
Fixes:
67735001
Test: manual
Android Build Merger (Role) [Mon, 16 Oct 2017 06:21:11 +0000 (06:21 +0000)]
Merge "Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours am:
b597ff837c -s ours am:
9336d62dcf -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Mon, 16 Oct 2017 06:17:10 +0000 (06:17 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours am:
b597ff837c -s ours
am:
9336d62dcf -s ours
Change-Id: Ic8d359bb94ed77d0f2f868a9d0705ecbe694559c
Bill Yi [Mon, 16 Oct 2017 06:16:00 +0000 (06:16 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours am:
b597ff837c -s ours
am:
9848c0af2c -s ours
Change-Id: I1797f216c7790fc672f957c109ae710886d2bd83
Bill Yi [Mon, 16 Oct 2017 06:07:55 +0000 (06:07 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours
am:
b597ff837c -s ours
Change-Id: I4372cfb4a6dc243e9915d40f147a38119e4d1666
Bill Yi [Mon, 16 Oct 2017 06:07:55 +0000 (06:07 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours
am:
b597ff837c -s ours
Change-Id: I23c9353f7d29150b47822f1a524b46a835e6ba77
Bill Yi [Mon, 16 Oct 2017 05:59:25 +0000 (05:59 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours
am:
7e3f20e249 -s ours
Change-Id: I81957a7142c7ee4f702e4895bdfebdb190750367
Bill Yi [Mon, 16 Oct 2017 05:48:58 +0000 (05:48 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours
am:
43b03fbacf -s ours
Change-Id: If3ad876fdb726d199a8ccc26a1808f358377e44b
Bill Yi [Mon, 16 Oct 2017 05:41:21 +0000 (05:41 +0000)]
Import translations. DO NOT MERGE
am:
b081f1e809 -s ours
Change-Id: I8589e76f2f5197beefddb2027261e290932d268f
Mathieu Chartier [Mon, 16 Oct 2017 04:13:28 +0000 (21:13 -0700)]
Add dalvik.vm.foreground-heap-growth-multiplier property
Corresponds to the -XX:ForegroundHeapGrowthMultiplier ART option.
Bug:
67416130
Test: make, flash, setprop
Change-Id: Ia9c70c62d8faa3b9aeb7b50dba237095abd53e80
Bill Yi [Sun, 15 Oct 2017 20:13:44 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id17cd2d22442f7bf1221be8f98164189757695a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Pankaj Kanwar [Sun, 15 Oct 2017 04:21:34 +0000 (04:21 +0000)]
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev
am:
7c18f52452
Change-Id: I12c3b3e3a0d4ad4919df5daeb07367f6197ffa93
Pankaj Kanwar [Sun, 15 Oct 2017 04:03:46 +0000 (04:03 +0000)]
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev
Tobias Thierer [Sun, 15 Oct 2017 03:18:47 +0000 (03:18 +0000)]
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am:
26817938f6 am:
e69366ff27
am:
8e60defe4b
Change-Id: Ic425066feb4288c37154d8b0c487aeda93a6ac59
Wileen Chiu [Sun, 15 Oct 2017 03:11:37 +0000 (03:11 +0000)]
Merge "Add change to show Invalid card when erroneous card is inserted." am:
4bc825aecc am:
8279494137
am:
9778539847
Change-Id: Ie5915e645a4e7a35fd934f54d6d3bf25ad4fcca3
Hugo Benichi [Sun, 15 Oct 2017 02:53:58 +0000 (02:53 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am:
d098328585 am:
104b2bcc79
am:
4071792cce
Change-Id: Id5ee94ae9a7e2a92289f2b25b0d5c0f0b5b7381a
Tobias Thierer [Sun, 15 Oct 2017 02:53:45 +0000 (02:53 +0000)]
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am:
26817938f6
am:
e69366ff27
Change-Id: Ieac3aadb7674ec63d4eed3d4d52f833e46d4a3a0
Wileen Chiu [Sun, 15 Oct 2017 02:47:23 +0000 (02:47 +0000)]
Merge "Add change to show Invalid card when erroneous card is inserted." am:
4bc825aecc
am:
8279494137
Change-Id: Ibd676d4d0f7b8d285c8c01769dc0686358f3a13d
Colin Cross [Sun, 15 Oct 2017 02:43:13 +0000 (02:43 +0000)]
Merge "Convert ext.jar to Android.bp" am:
42156f3e56 am:
8feea076a2
am:
faededa6af
Change-Id: I9e640ea1f6175306c74075e25485bce622d6ca52
Hugo Benichi [Sun, 15 Oct 2017 02:38:58 +0000 (02:38 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am:
d098328585
am:
104b2bcc79
Change-Id: Ie935c7df75b95afff7b2817df35afe4798e91813
Tobias Thierer [Sun, 15 Oct 2017 02:38:05 +0000 (02:38 +0000)]
Merge "Update locked_region_code_injection tool to ASM 6.0-BETA."
am:
26817938f6
Change-Id: I193d04b7a4ebf0f39f60ac275a7eeb93499ded9d
Wileen Chiu [Sun, 15 Oct 2017 02:32:25 +0000 (02:32 +0000)]
Merge "Add change to show Invalid card when erroneous card is inserted."
am:
4bc825aecc
Change-Id: I89a5b529033c30defacc715ef3c8310500e5fae7
Mathieu Chartier [Sun, 15 Oct 2017 02:31:19 +0000 (02:31 +0000)]
Merge "Add property reading logic for dalvik.vm.madvise-random" into oc-mr1-dev
am:
a354ec973d
Change-Id: Ic75411af539a08e215b5c9e076688fd39b46569d
Hugo Benichi [Sun, 15 Oct 2017 02:24:52 +0000 (02:24 +0000)]
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
am:
d098328585
Change-Id: I1cbe45eb339903630675713d287e3375c7c98e62
Winston Man [Sun, 15 Oct 2017 02:22:06 +0000 (02:22 +0000)]
Merge "Update CtsShim with multiArch" into oc-mr1-dev
am:
0d2d6b6a86
Change-Id: Idcaf213ed1e081c816f1e6a8fa8a1650f6b04265
Colin Cross [Sun, 15 Oct 2017 02:19:40 +0000 (02:19 +0000)]
Merge "Convert ext.jar to Android.bp" am:
42156f3e56
am:
8feea076a2
Change-Id: I7db0fc0e79fdc0301f80b45c2001ec55031b137e
Zhi An Ng [Sun, 15 Oct 2017 02:17:20 +0000 (02:17 +0000)]
Merge "Only show dialog if top app is killed" into oc-mr1-dev
am:
4018898ae4
Change-Id: I01bb75704d262cccce0f97aeb13de2ba02ace2f0
Abodunrinwa Toki [Sun, 15 Oct 2017 02:11:46 +0000 (02:11 +0000)]
Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev
am:
14ba6e10c0
Change-Id: I0ddb7b827ad8b0be37c7e1adc5a95493bd35d61f
Colin Cross [Sun, 15 Oct 2017 02:06:20 +0000 (02:06 +0000)]
Merge "Convert ext.jar to Android.bp"
am:
42156f3e56
Change-Id: I44443e9095c8b527ebb42d11a6f5369fdf3e5d05
Mathieu Chartier [Sun, 15 Oct 2017 02:06:02 +0000 (02:06 +0000)]
Merge "Add android.os.Parcel$ReadWriteHelper to compiled classes" into oc-mr1-dev
am:
5b4d0e0404
Change-Id: I08773b81acdf9f7c16be246ba056b9f8f54b4e6c
Hall Liu [Fri, 13 Oct 2017 23:51:21 +0000 (16:51 -0700)]
Add null checks to EMBMS AIDL impls
Add null checks for things that the user passes in so that they don't
inadvertently cause NPEs for the middleware later on.
Change-Id: I09392a2ac9adec494fcbeeba889ce7fca6708323
Fixes:
67785040
Test: manual
Calin Juravle [Fri, 13 Oct 2017 23:46:26 +0000 (23:46 +0000)]
Revert "When updating a split app, copy compiled files from base.apk only."
This reverts commit
d1235f54d4943a0a3a920013a5875b5193bd0490.
Reason for revert: We now include the classpath when asking the runtime
if we need to dexopt. This hack is no longer needed.
Bug:
62269291
Change-Id: I396778f6db0acbbe9017168b35e6023ff97f36fe
OSDN Git Service
