OSDN Git Service
TreeHugger Robot [Sat, 4 Aug 2018 14:22:06 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sat, 4 Aug 2018 14:21:40 +0000 (14:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sat, 4 Aug 2018 14:21:17 +0000 (14:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sat, 4 Aug 2018 14:20:51 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sat, 4 Aug 2018 14:19:41 +0000 (14:19 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sat, 4 Aug 2018 14:19:17 +0000 (14:19 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sat, 4 Aug 2018 14:18:26 +0000 (14:18 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sat, 4 Aug 2018 10:42:14 +0000 (03:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I44070d387a2390be36be4dd40da84dfb1bc4b2ea
Auto-generated-cl: translation import
Bill Yi [Sat, 4 Aug 2018 10:35:34 +0000 (03:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I182bf58f1a2dc24a8c11928301a361734a3660c4
Auto-generated-cl: translation import
Bill Yi [Sat, 4 Aug 2018 08:57:32 +0000 (01:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14c08f6f215dcb6edf1e5ffe62248c0302a9c82d
Auto-generated-cl: translation import
Bill Yi [Sat, 4 Aug 2018 08:51:57 +0000 (01:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I900df95e8d246820015342735914d380819bcbab
Auto-generated-cl: translation import
Bill Yi [Sat, 4 Aug 2018 08:46:00 +0000 (01:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd4c8a69c7eb2fd594ca54eeef9b259390ec367b
Auto-generated-cl: translation import
Bill Yi [Sat, 4 Aug 2018 07:41:23 +0000 (00:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id53f9f36e77037c6dc346c14009f35ea249cf33f
Auto-generated-cl: translation import
Bill Yi [Sat, 4 Aug 2018 07:35:26 +0000 (00:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife7d9e382f36d1c96ac51a85a1f6593b4420c97b
Auto-generated-cl: translation import
Bill Yi [Sat, 4 Aug 2018 07:06:26 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a207fdef24623e8ca82d7ce58049c5be2330e89
Auto-generated-cl: translation import
Nathan Harold [Fri, 3 Aug 2018 16:47:30 +0000 (09:47 -0700)]
[automerger skipped] Merge "Throw on revoked location permission - framework"
am:
bb67bab55f -s ours
Change-Id: I566ad0495ae7de26ccccd91be959636712292de9
Makoto Onuki [Fri, 3 Aug 2018 15:07:01 +0000 (08:07 -0700)]
resolve merge conflicts of
c02b2ec3f179820c31c470d89b919ce721513472 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iabf4bf87cc8aec5dab871096fe320098c4622545
Mathew Inwood [Fri, 3 Aug 2018 11:17:45 +0000 (04:17 -0700)]
Merge "Add @UnsupportedAppUsage annotations"
am:
058b566f90
Change-Id: I982201ecfc2f257ff5509de10a73549ebe657aff
Mathew Inwood [Fri, 3 Aug 2018 11:12:24 +0000 (04:12 -0700)]
Merge "Add @UnsupportedAppUsage annotations"
am:
f892a8ce9f
Change-Id: I34b238c2105ea4f46c1cbdbc4b2e4375562398f1
Mathew Inwood [Fri, 3 Aug 2018 10:05:02 +0000 (11:05 +0100)]
resolve merge conflicts of
92b78539e3a177b6f1912474f672db29a211e604 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I6176e760bb0912fd075a36d65fa0b49680c14aa3
Change-Id: I71a17fa603fcd2339bfca54f9e5a7740bc54972f
Mathew Inwood [Fri, 3 Aug 2018 07:59:35 +0000 (08:59 +0100)]
resolve merge conflicts of
6987a91e7c73505fd8910d3d396adf76baf947e0 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I773bda19dc7b32c01bf064bf78b517896e8df991
Change-Id: I2c9bd92522932175856fb72ca5cce2c1999f4a1e
Nathan Harold [Thu, 2 Aug 2018 22:16:07 +0000 (22:16 +0000)]
Merge "Throw on revoked location permission - framework"
Svet Ganov [Thu, 8 Mar 2018 03:53:43 +0000 (19:53 -0800)]
Throw on revoked location permission - framework
When we fixed proper handling of location permisison gating
sensitive telephony calls we stopped throwing a security
exception when the permission is not held by the caller.
While this is not a security issue there is no reason to
change this behavior which is checked by CTS. This CL starts
throwing a security exception if the permission is not held.
Test: atest android.permission.cts.NoLocationPermissionTest
bug:
74074103
Merged-In: Ic891d62b408c692f84a345f24503f7f25d583e35
Change-Id: Ic891d62b408c692f84a345f24503f7f25d583e35
(cherry picked from commit
33b150937522ccda37567c1303117ac8f1bb6f7f)
Makoto Onuki [Thu, 2 Aug 2018 17:22:33 +0000 (17:22 +0000)]
Merge "use correct userId when startProcess failed"
Mathew Inwood [Thu, 2 Aug 2018 16:39:15 +0000 (17:39 +0100)]
resolve merge conflicts of
20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I9437532ae617eda28aa5ae796563e985cc0ddbca
Change-Id: Ifa50d21fb63b7ac73ab2ddaeebb1e01f535595c7
Treehugger Robot [Thu, 2 Aug 2018 15:53:55 +0000 (15:53 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
gaoshiqi [Tue, 31 Jul 2018 02:14:51 +0000 (10:14 +0800)]
use correct userId when startProcess failed
use app.userId
Change-Id: I989289e895d4263823cc68bf5ee1e307334aeafb
Merged-in: I1cbc37fdda8530bee6f1cf1d4d7d16776b4ff55d
Signed-off-by: gaoshiqi <gaoshiqi@xiaomi.com>
Mathew Inwood [Thu, 2 Aug 2018 15:33:43 +0000 (08:33 -0700)]
Merge "Add @UnsupportedAppUsage annotations"
am:
3b89584a7e
Change-Id: I65a52e7ed92b09f7bf5c83eb0007f217ee5eaf6b
Treehugger Robot [Thu, 2 Aug 2018 15:11:40 +0000 (15:11 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Mathew Inwood [Thu, 2 Aug 2018 11:23:41 +0000 (12:23 +0100)]
resolve merge conflicts of
95f8ca9f74b75fda6b05d08d49a1488dd0238c10 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I7fc1162d2c63df8751a4660607e8ce72070efed8
Change-Id: I0e5a5d8fda273644e8c592ce7d059e508870085e
Treehugger Robot [Thu, 2 Aug 2018 13:27:00 +0000 (13:27 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Mathew Inwood [Thu, 2 Aug 2018 13:26:45 +0000 (13:26 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Treehugger Robot [Thu, 2 Aug 2018 10:36:35 +0000 (10:36 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Mathew Inwood [Thu, 2 Aug 2018 09:02:41 +0000 (09:02 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Treehugger Robot [Thu, 2 Aug 2018 09:00:47 +0000 (09:00 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Hall Liu [Wed, 1 Aug 2018 23:09:51 +0000 (16:09 -0700)]
Merge "Telecom: Reset the duration after the CDMA call is accepted"
am:
2cbf44dc2f
Change-Id: I823efd5765b77fcf55f4c38a6091d980530abae8
Mathew Inwood [Wed, 1 Aug 2018 23:05:35 +0000 (16:05 -0700)]
Merge "Code formatting change for upcoming annotations."
am:
5d669f79f2
Change-Id: Iffd38fbc5ee5cd01d5900afbfee331e005b860c6
Mathew Inwood [Wed, 1 Aug 2018 23:01:52 +0000 (16:01 -0700)]
Merge "Code reformatting for upcoming annotations."
am:
60c8cfdd0f
Change-Id: I4fcf520f53dddd6e70edf0d59fd13ae218c336a5
Mathew Inwood [Wed, 1 Aug 2018 22:58:23 +0000 (15:58 -0700)]
Merge "Add @UnsupportedAppUsage annotations"
am:
35ba945c50
Change-Id: Ief65c4b1d3842f8d9c170545d6e271ef293fa6ba
Sundong Ahn [Wed, 1 Aug 2018 22:55:02 +0000 (15:55 -0700)]
Merge "Change the "since" arguments generation."
am:
ea77ee39f5
Change-Id: Ia00ed78e8b22875ad2aba2877f6a6b78f7683e81
Nathan Harold [Wed, 1 Aug 2018 22:51:30 +0000 (15:51 -0700)]
Merge "Pass SdkVersion to getNeighboringCellInfo"
am:
cec3f1fafb
Change-Id: I46ede415a660852938506b9bd4eebff409da5929
Nathan Harold [Wed, 1 Aug 2018 22:48:12 +0000 (15:48 -0700)]
Merge "Count and Report Bandwidth Requests by UID"
am:
e1d140619f
Change-Id: Iadfb7c04a49055c57cc8eed2ce9ad5f10e15cf52
Luke Huang [Wed, 1 Aug 2018 22:44:30 +0000 (15:44 -0700)]
Merge "Idletimer-related commands porting"
am:
b6b8516ba0
Change-Id: I48997db764885415f952520c5a29c5da34327e39
Malcolm Chen [Wed, 1 Aug 2018 22:41:01 +0000 (15:41 -0700)]
[automerger skipped] Merge "Have proper permission check in getConfigForSubId"
am:
c14a4be799 -s ours
Change-Id: I3bc606975e0ced7353e9bb174da95f4edcefdb1f
Hall Liu [Wed, 1 Aug 2018 21:36:56 +0000 (21:36 +0000)]
Merge "Telecom: Reset the duration after the CDMA call is accepted"
Treehugger Robot [Wed, 1 Aug 2018 14:52:26 +0000 (14:52 +0000)]
Merge "Code formatting change for upcoming annotations."
Mathew Inwood [Wed, 1 Aug 2018 14:35:51 +0000 (15:35 +0100)]
Add @UnsupportedAppUsage annotations
For packages:
android.ddm
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Change-Id: I9f1ac383f0f71b8c9437756e3d526ee64ad0c558
Merged-In: Ia3e508bf6fbb48ca0fad3dc7b6dc722aac29c191
Mathew Inwood [Wed, 1 Aug 2018 13:42:25 +0000 (14:42 +0100)]
Add @UnsupportedAppUsage annotations
For packages:
android.animation
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Change-Id: I6702ce1fb26452971e5eee8da15d5816dd75bb12
Merged-In: If0667154031b254fd632e1332fb65e9b08955755
Mathew Inwood [Wed, 1 Aug 2018 13:28:00 +0000 (14:28 +0100)]
Add @UnsupportedAppUsage annotations
For packages:
android.accessibilityservice
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Change-Id: Ic677593dc2d206335275ecbad4d4a1020972ef38
Merged-In: I9437532ae617eda28aa5ae796563e985cc0ddbca
Mathew Inwood [Wed, 1 Aug 2018 13:07:13 +0000 (14:07 +0100)]
Add @UnsupportedAppUsage annotations
For packages:
com.android.ims.internal.uce.uceservice
com.android.ims.internal.uce.presence
com.android.ims.internal.uce.options
com.android.ims.internal.uce.common
com.android.ims.internal
com.android.ims
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Change-Id: I9e39973bf43a80f17038f7e239a94ef2209e6e2a
Merged-In: Ib1819d4d15e730c0f224b45fb72f3225b0dddf91
Mathew Inwood [Wed, 1 Aug 2018 12:52:03 +0000 (13:52 +0100)]
Code formatting change for upcoming annotations.
Putting /** @hide */ on the same line results in the automated annotation
addition putting the annotation the previous line, which then results in
the @hide javadoc annotation being ignored (since it's now no longer
strictly before the method declaration).
Bug:
110868826
Test: m
Change-Id: I1b5c290a17ead46effd2f2ff3f4b33884efbc116
Treehugger Robot [Wed, 1 Aug 2018 12:18:10 +0000 (12:18 +0000)]
Merge "Code reformatting for upcoming annotations."
Mathew Inwood [Wed, 1 Aug 2018 09:24:49 +0000 (10:24 +0100)]
Code reformatting for upcoming annotations.
@UnsupportedAppUsage annotations are added automatically, but this does
not work when there are multiple definitions on the same line.
Test: m
Bug:
110868826
Change-Id: I2c26c136cdfa557e45cf1ee0b39dab9c17abde56
Mathew Inwood [Wed, 1 Aug 2018 08:49:18 +0000 (08:49 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Malcolm Chen [Wed, 28 Feb 2018 23:20:45 +0000 (15:20 -0800)]
Have proper permission check in getConfigForSubId
In CarrierConfigManager, add pass context in constructor, so that
when calling CarrierConfigLoader#getConfigForSubId, it can pass
callingPackage.
Bug:
73136824
Test: regression
Change-Id: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Merged-In: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Treehugger Robot [Tue, 31 Jul 2018 23:47:44 +0000 (23:47 +0000)]
Merge "Change the "since" arguments generation."
Nan Zhang [Tue, 31 Jul 2018 22:14:41 +0000 (22:14 +0000)]
Merge "Add offline/online-sdk-docs in Soong." into stage-aosp-master
Nathan Harold [Tue, 31 Jul 2018 20:28:59 +0000 (20:28 +0000)]
Merge "Pass SdkVersion to getNeighboringCellInfo"
Nathan Harold [Tue, 31 Jul 2018 18:13:21 +0000 (18:13 +0000)]
Merge "Count and Report Bandwidth Requests by UID"
Mathew Inwood [Tue, 31 Jul 2018 16:28:39 +0000 (17:28 +0100)]
Add @UnsupportedAppUsage annotations
For packages:
android.printservice.recommendation
android.printservice
android.print.pdf
android.print
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Change-Id: Id5e5af10a0406db44046c68a4ea659feaf899ec7
Merged-In: I97fb9c95dad2f93a8e989f3f48f323e9f76eaf31
Mathew Inwood [Tue, 31 Jul 2018 15:04:15 +0000 (16:04 +0100)]
Add @UnsupportedAppUsage annotations
For packages:
android.nfc.tech
android.nfc.dta
android.nfc.cardemulation
android.nfc
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: I6176e760bb0912fd075a36d65fa0b49680c14aa3
Change-Id: I2da62ff82b75ba4a5a0a64d02c6ebdb101992765
Mathew Inwood [Tue, 31 Jul 2018 13:21:52 +0000 (14:21 +0100)]
Add @UnsupportedAppUsage annotations
For packages:
android.graphics
android.graphics.drawable
android.graphics.drawable.shapes
android.graphics.fonts
android.graphics.pdf
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: I7fc1162d2c63df8751a4660607e8ce72070efed8
Change-Id: I5d7739d2d1fc7bb12ee059bcc2a9ac9017ca35fb
Luke Huang [Tue, 31 Jul 2018 08:11:54 +0000 (08:11 +0000)]
Merge "Idletimer-related commands porting"
Mengjun Leng [Tue, 4 Jul 2017 03:10:37 +0000 (11:10 +0800)]
Telecom: Reset the duration after the CDMA call is accepted
In android original design, the duration of CDMA MO call is started from
the dial command sent, so it is not the real duration of the active time.
In this patch, a new message is registered to listen the event of the call
accepted, and then reset the duration when the event happens.
Change-Id: Icc447012030ae243f200ec2c83b7d5210af9b31c
Luke Huang [Fri, 27 Jul 2018 12:08:21 +0000 (20:08 +0800)]
Idletimer-related commands porting
Test: runtest frameworks-net passes
Test: manual testing of idletimer works
Change-Id: I63e20aa3861e613b0970be30a70d0972d7e33d8c
Nathan Harold [Mon, 30 Jul 2018 20:38:01 +0000 (13:38 -0700)]
Count and Report Bandwidth Requests by UID
To debug power drain due to modem wakeups,
one of the signals we'd like to track is
requests for bandwidth estimate to see which
apps are making requests and how often. This
patch keeps a simple count per-UID when an
app requests a bandwidth update, and that
count is made available in dumpsys.
Bug:
77498849
Test: runtest frameworks-net
Change-Id: I30d2ce85f9fa6747030cf4039d1080113a32e386
Nathan Harold [Fri, 20 Jul 2018 19:08:24 +0000 (12:08 -0700)]
Pass SdkVersion to getNeighboringCellInfo
Bug:
62490173
Test: tested manually with SL4A (P and P+ SDK)
Change-Id: I65bae72ab8379f996486e7f4326eddf1b305658a
TreeHugger Robot [Mon, 30 Jul 2018 20:30:35 +0000 (20:30 +0000)]
Merge "Frameworks: convert platformprotos to soong" into stage-aosp-master
Treehugger Robot [Mon, 30 Jul 2018 19:49:20 +0000 (19:49 +0000)]
Merge "Have proper permission check in getConfigForSubId"
Malcolm Chen [Wed, 28 Feb 2018 23:20:45 +0000 (15:20 -0800)]
Have proper permission check in getConfigForSubId
In CarrierConfigManager, add pass context in constructor, so that
when calling CarrierConfigLoader#getConfigForSubId, it can pass
callingPackage.
Bug:
73136824
Test: regression
Change-Id: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Merged-In: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Mathew Inwood [Fri, 27 Jul 2018 15:06:00 +0000 (16:06 +0100)]
Add @UnsupportedAppUsage annotations
For packages:
android.view.animation
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Change-Id: I52f3e770dd1e8240e67c897e7788bd928145f583
Merged-In: I773bda19dc7b32c01bf064bf78b517896e8df991
Remi NGUYEN VAN [Fri, 27 Jul 2018 13:08:08 +0000 (06:08 -0700)]
Merge "Increase network request timeouts"
am:
527c79d96d
Change-Id: Iaae31d7eaa5e5ccccdcf63ba39dd3fdc729161a5
Treehugger Robot [Fri, 27 Jul 2018 11:56:31 +0000 (11:56 +0000)]
Merge "Increase network request timeouts"
Remi NGUYEN VAN [Fri, 27 Jul 2018 09:11:47 +0000 (02:11 -0700)]
Merge "Increase IpClientTest verification timeout"
am:
0cbdca3e20
Change-Id: I214df25ed178d859ae60d765c94fc9d6a25408ee
Remi NGUYEN VAN [Fri, 27 Jul 2018 08:08:16 +0000 (08:08 +0000)]
Merge "Increase IpClientTest verification timeout"
Remi NGUYEN VAN [Fri, 27 Jul 2018 07:11:06 +0000 (00:11 -0700)]
Merge "Use timeout consts in all ConnService tests"
am:
3fbbe73437
Change-Id: Ie62b9893c5b5f4e7b24197c1308d33e06a6c8f71
Remi NGUYEN VAN [Fri, 27 Jul 2018 06:37:13 +0000 (15:37 +0900)]
Increase network request timeouts
With recent performance degradations on apct, the current timeouts are
too short and some requests trigger onUnavailable() before networks are
validated.
Test: runtest -x ConnectivityServiceTest.java
Bug: b/
111778226
Change-Id: I083f529787f108065637a0aff3e5bb88e05e6510
Remi NGUYEN VAN [Fri, 27 Jul 2018 05:50:35 +0000 (05:50 +0000)]
Merge "Use timeout consts in all ConnService tests"
Remi NGUYEN VAN [Fri, 27 Jul 2018 03:48:54 +0000 (12:48 +0900)]
Increase IpClientTest verification timeout
apct runs have become significantly slower, which makes some of these
tests flaky. Increase the timeout as a first measure to avoid flakes.
Bug: b/
111819270
Test: runtest -x IpClientTest.java
Change-Id: Ifb0091377f311b67ba3a4f9324ce1e8cfb421ea3
Remi NGUYEN VAN [Thu, 26 Jul 2018 09:41:36 +0000 (18:41 +0900)]
Use timeout consts in all ConnService tests
Fix some timeouts that were forgotten in parent CL.
Bug: b/
111778226
Test: runtest --no-hidden-api-checks -x ConnectivityServiceTest.java
Change-Id: Ib848eaba8c69c07ac596aa4386a741c9a2a87fc9
Iris Chang [Fri, 27 Jul 2018 02:25:01 +0000 (19:25 -0700)]
Merge "Skip from copying preopted files if device is undecrypted"
am:
17977d897e
Change-Id: I169da87e2aca3b5146e91da4c635f583af94b27b
Treehugger Robot [Fri, 27 Jul 2018 01:00:00 +0000 (01:00 +0000)]
Merge "Skip from copying preopted files if device is undecrypted"
Colin Cross [Fri, 27 Jul 2018 00:59:29 +0000 (17:59 -0700)]
Merge "Remove references to full_classes_proguard_jar"
am:
6dfabc4353
Change-Id: I7a58cf68525f2e5ff60a50122dac5de781915bdc
Hall Liu [Fri, 27 Jul 2018 00:52:16 +0000 (17:52 -0700)]
Merge "Add carrier config for auto redialing 911"
am:
b91316f203
Change-Id: Ie77021a09bb896faaa5fc5686563b0ddbf645d48
Andreas Gampe [Fri, 27 Jul 2018 00:38:26 +0000 (00:38 +0000)]
Merge "resolve merge conflicts of
eff814e768f0a65006bb07520983df799ed0cbd9 to stage-aosp-master" into stage-aosp-master
Treehugger Robot [Thu, 26 Jul 2018 23:13:15 +0000 (23:13 +0000)]
Merge "Remove references to full_classes_proguard_jar"
Andreas Gampe [Thu, 26 Jul 2018 22:07:54 +0000 (15:07 -0700)]
resolve merge conflicts of
eff814e768f0a65006bb07520983df799ed0cbd9 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8f602eed512285de840bbadceefb88fdbd652780
Hall Liu [Thu, 26 Jul 2018 20:22:03 +0000 (20:22 +0000)]
Merge "Add carrier config for auto redialing 911"
Mathieu Chartier [Thu, 26 Jul 2018 19:45:37 +0000 (19:45 +0000)]
Merge "Update system server profile"
Colin Cross [Thu, 26 Jul 2018 19:37:22 +0000 (12:37 -0700)]
Remove references to full_classes_proguard_jar
We always use R8 instead of proguard now, which shrinks while converting
to dex, so there is is no proguarded classes jar. Use
full_classes_pre_proguard_jar instead.
Bug:
111885749
Test: m checkbuild
Change-Id: Ia0c35d9068b72573ae5970dc7e2c2b1b489b32f3
Mathew Inwood [Thu, 26 Jul 2018 18:55:02 +0000 (11:55 -0700)]
Merge "Remove class2greylist from frameworks/base."
am:
32979f03fe
Change-Id: I72f8797be98fe75806535da7b9f277ae68db8d57
Mathew Inwood [Thu, 26 Jul 2018 17:43:28 +0000 (17:43 +0000)]
Merge "Remove class2greylist from frameworks/base."
Calin Juravle [Wed, 6 Jun 2018 15:59:42 +0000 (08:59 -0700)]
Update system server profile
The previous profile contained only a few methods and classes
due to an error during processing.
(cherry-picked from commit
0161eaf5666fbb523b68dc77b965b96a0fab8cdd)
Test: build & flash & boot
Bug:
111820715
Merged-In: I4caac335941e2cc84c153652c5206fefdc03596b
Change-Id: I4caac335941e2cc84c153652c5206fefdc03596b
Mathew Inwood [Thu, 26 Jul 2018 13:57:08 +0000 (14:57 +0100)]
Remove class2greylist from frameworks/base.
It's moving to a new home under art/tools, since it is needed by
branches which don't include frameworks/base.
Bug:
110868826
Test: Build master-art branch
Change-Id: Ice8324db52ae1e7e2ac6734e45874a66de935c9a
Olivier Gaillard [Thu, 26 Jul 2018 14:20:50 +0000 (07:20 -0700)]
Merge "Enable generating Binder#getTransactionName method."
am:
3134def524
Change-Id: I5dcdceb1d1e4525576ac21a2bba964dfb6bb0006
Olivier Gaillard [Thu, 26 Jul 2018 13:04:32 +0000 (13:04 +0000)]
Merge "Enable generating Binder#getTransactionName method."
Remi NGUYEN VAN [Thu, 26 Jul 2018 11:10:02 +0000 (04:10 -0700)]
Merge "Increase linger delay and test callback timeout"
am:
716c04b29a
Change-Id: I088de7dae4191a65e75feb9e071dcf18c30dcf21
Olivier Gaillard [Thu, 26 Jul 2018 10:52:37 +0000 (11:52 +0100)]
Enable generating Binder#getTransactionName method.
Test: manual
Bug:
111791983
Change-Id: I68090e6fa5a7876b1e878d0b97807856e3053b36
Iris Chang [Mon, 2 Jul 2018 01:53:53 +0000 (09:53 +0800)]
Skip from copying preopted files if device is undecrypted
After applies issue
78613232 patch (create symlink in init.rc),
we found device boots to home screen fail.
When device is FDE (Full Disk Encryption) and user sets the
Password/Pattern/PIN to lock phone and then reboot the device,
data partition will be mounted as tmpfs (256MB) until device
is unlocked after user inputs Password/Pattern/PIN.
During device boot-up process, PMS (Package Manager Service) will
execute requestCopyPreoptedFiles when device first boots, and it
may cause device fails to boot to home screen because PMS copies
larger system_b (about 500MB) to smaller tmpfs (tmpfs is only 256MB)
before device is decrypted.
We suggest that PMS doesn't execute requestCopyPreoptedFiles when
device is undecrypted during first boot.
Bug:
78613232
Test: Device boot up to launcher normally.
Test: APPs work normally after A/B upgrade.
Change-Id: I893e0e217a59577299e97adfbf5dc7762dffda7c
Remi NGUYEN VAN [Thu, 26 Jul 2018 09:54:03 +0000 (09:54 +0000)]
Merge "Increase linger delay and test callback timeout"