OSDN Git Service
Hongming Jin [Tue, 19 Jun 2018 19:35:37 +0000 (12:35 -0700)]
Revoke permissions defined in a to-be removed package.
Bug:
67319274
Test: run cts-dev --module CtsPermissionTestCases --test android.permission.cts.RemovePermissionTest#permissionShouldBeRevokedIfRemoved
Change-Id: Id23535d6c4d2fcf5c86dc1338af13a561b32154c
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
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"
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."
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."
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
Jeff Sharkey [Fri, 13 Jul 2018 01:47:49 +0000 (19:47 -0600)]
Extend SQLiteQueryBuilder for update and delete.
Developers often accept selection clauses from untrusted code, and
SQLiteQueryBuilder already supports a "strict" mode to help catch
SQL injection attacks. This change extends the builder to support
update() and delete() calls, so that we can help secure those
selection clauses too.
Extend it to support selection arguments being provided when
appending appendWhere() clauses, meaning developers no longer need
to manually track their local selection arguments along with
remote arguments.
Extend it to support newer ContentProvider.query() variant that
accepts "Bundle queryArgs", and have all query() callers flow
through that common code path. (This paves the way for a future
CL that will offer to gracefully extract non-WHERE clauses that
callers have tried smashing into their selections.)
Updates ContentValues to internally use more efficient ArrayMap.
Bug:
111268862
Test: atest frameworks/base/core/tests/utiltests/src/com/android/internal/util/ArrayUtilsTest.java
Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Change-Id: I60b6f69045766bb28d2f21a32c120ec8c383b917
Ecco Park [Fri, 13 Jul 2018 22:22:37 +0000 (15:22 -0700)]
passpoint-r1: fix the wrong filed for PPS-MO.
Currently Passpoint-r1 follows the PPS-MO format to install passpoint
profile.
Howevever, one field(SubscriptionParameter) is not correct.
Normally passpoint-r1 doesn't use this field because this is used for
passpoint-r2 feature.
So, currently there is no issue with wrong field for using passpoint-r1.
But, it needs to be "SubscriptionParameters" according to the hostpot2.0
release 2.0 techinical specification.
Bug:
111449001
Test: ./frameworks/base/wifi/tests/runtests.sh
Change-Id: Idb6bb4d28913bd3d0905b330e25fbb20b99bbf2e
Signed-off-by: Ecco Park <eccopark@google.com>
Ryan Mitchell [Thu, 12 Jul 2018 18:24:51 +0000 (11:24 -0700)]
AAPT2: Fix long version code bugs
Refactoring areas in AAPT2 that use android:versionCode to also use
abdroid:versionCodeMajor. Does not add versionCodeMajor command line flag yet.
Bug:
109883459
Test: aapt2_tests
Change-Id: I573fbea37491cf8c5742f9e385c66ee64c4e5166
Suprabh Shukla [Mon, 9 Jul 2018 23:59:27 +0000 (16:59 -0700)]
Making timerfd non-blocking in alarm manager.
Alarm manager uses timerfd with epoll_wait, so there can be a race where
read blocks if timerfd_settime was called after epoll_wait returns and
before read is called. Since epoll_wait returned, we should be treating
that as sufficient signal that the timer expired.
In general, it should be better to have a non-blocking fd with
epoll_wait as the kernel holds a wakelock until the next epoll_wait and
if we move the timer to the future the system should be waiting inside
epoll_wait and not inside read, to allow the system to go into suspend.
This is also expected to mitigate or eliminate cases where we are seeing
alarm delivery stuck while the system is stuck somewhere in read, while
the higher level code keeps waiting for it to return.
Test: builds, boots, existing tests pass:
atest CtsAlarmManagerTestCases
Bug:
78560047
Change-Id: Idbb3bf94b7e750686701757d2d27ad2d3246294f
Ryan Mitchell [Fri, 13 Jul 2018 23:24:57 +0000 (23:24 +0000)]
Merge "AAPT2: Refactor flags into commands"
TreeHugger Robot [Fri, 13 Jul 2018 23:14:22 +0000 (23:14 +0000)]
Merge "Remove an unused parameter from InstallArgs.doRename"
Chris Morin [Tue, 10 Jul 2018 19:42:06 +0000 (12:42 -0700)]
Reland "OOM score management"
Add 2 additional attirubte |isFocused| and |lastActivityTime| in
ActivityManager.RunningAppProcessInfo and pass them to Chrome via IPC
so Chrome can better prioritize ARC processes.
Bug:
29576205
Test: Ensure new process information is passed to Chrome.
Nathan Harold [Fri, 13 Jul 2018 22:45:31 +0000 (15:45 -0700)]
Merge "Re-Number RIL Message IDs to Match RIL.h"
am:
8424001a04
Change-Id: I5d284e48bbc2c9c461004f521bd719a490b9fed9
Victor Khimenko [Fri, 13 Jul 2018 22:42:35 +0000 (22:42 +0000)]
Merge "Add fallback case to layers_extensions.cpp"
Chih-hung Hsieh [Fri, 13 Jul 2018 22:42:26 +0000 (22:42 +0000)]
Merge "Fix unnecessary copy initialization warnings"
Tyler Gunn [Fri, 13 Jul 2018 22:37:40 +0000 (15:37 -0700)]
Merge "Update InCallService API docs to explain how to show incoming call UI."
am:
ac47c63b36
Change-Id: I4b3f34199c471006c71c2560f365ad314580b0a3
Jorim Jaggi [Fri, 13 Jul 2018 22:36:08 +0000 (22:36 +0000)]
Merge "Pin compiled code of HOME app" into pi-dev
Jack Yu [Wed, 6 Jun 2018 00:38:56 +0000 (17:38 -0700)]
Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.
Bug:
73659459
Test: Build
Change-Id: Ia67ebf94771c7ff5f5d90f6cdd303cb2716f9186
(cherry picked from commit
b4094993f742fbe9d07bd5783030aa82a3045f79)
Howard Ro [Wed, 20 Jun 2018 02:58:05 +0000 (19:58 -0700)]
Definition of GenericAtom
Test: no test is necessary as it only adds a field to atoms.proto
Change-Id: If4e7c9497d1a4a8ba0fda3e8fb1ef67c525d6e64
Bug:
110537998
Ryan Mitchell [Tue, 10 Jul 2018 20:51:36 +0000 (13:51 -0700)]
AAPT2: Refactor flags into commands
Refactors the flag based command invocation into classes that make using
subcommands easier.
Test: manual tests of printing
Change-Id: Ic8df6af0be30db552e32150afebecbfeec7e1075
Christopher Morin [Fri, 13 Jul 2018 21:14:07 +0000 (21:14 +0000)]
Merge "Drop binder calling identity before updating device stats"
Amy [Mon, 25 Jun 2018 18:51:12 +0000 (11:51 -0700)]
Add system property for turn on system audio control when power on device.
Test: make -j18
Change-Id: I32275cccec10cab10dc6b86c4e8b4aa580462b7b
Bug:
80297170
(cherry picked from commit
411d7fdaab1fd99ff109b2d2f2a2049621676ad3)
Change-Id: I7d9c390160e1e79298b3fcbdc8129069b6cddbfc
TreeHugger Robot [Fri, 13 Jul 2018 21:09:46 +0000 (21:09 +0000)]
Merge "Add system audio mode related handlers."
Jack Yu [Fri, 13 Jul 2018 20:56:16 +0000 (13:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master am:
1bee26f4c3 -s ours
am:
7604760e22 -s ours
Change-Id: I18410bc47cf77987fef4fbb977bec82e953c839f
Lucas Dupin [Fri, 13 Jul 2018 20:50:48 +0000 (20:50 +0000)]
Merge "Activate night mode when battery saver"
Chih-Hung Hsieh [Fri, 13 Jul 2018 20:37:03 +0000 (13:37 -0700)]
Fix unnecessary copy initialization warnings
Bug:
30413862
Test: build with WITH_TIDY=1
Change-Id: I333d3a6b3394f50712148eeabf2253f1e01b21f3
Tyler Gunn [Fri, 13 Jul 2018 20:22:48 +0000 (13:22 -0700)]
Merge "Make Connection#onSilence a public API." am:
cbe3737f13 am:
01ab0b90bf
am:
9aca012ab5
Change-Id: Icf3491038487e47983b84255cdc32214595ce470
Yueming Wang [Fri, 13 Jul 2018 20:14:26 +0000 (13:14 -0700)]
[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" am:
f92ad05fa5 -s ours am:
6dd8f735d2 -s ours
am:
0aff4a19f9 -s ours
Change-Id: Ifd7fa2a83fa262a9c7ae72f80274033f604ebb25
Jack Yu [Fri, 13 Jul 2018 20:06:31 +0000 (13:06 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master
am:
1bee26f4c3 -s ours
Change-Id: I236396a3080e5b435db417ba2ed10485232976ec
Nathan Harold [Fri, 13 Jul 2018 19:57:06 +0000 (19:57 +0000)]
Merge "Re-Number RIL Message IDs to Match RIL.h"
Amy [Tue, 12 Jun 2018 00:26:26 +0000 (17:26 -0700)]
Add system audio mode related handlers.
Test: atest com.android.server.hdmi
Change-Id: I4fd10ceb9e8a5951584f3917dc267a04091049cf
(cherry picked from commit
714cd0383c639613aa21eabfe3e20bb3b7386244)
Shrijana Ghimire [Fri, 13 Jul 2018 19:48:15 +0000 (12:48 -0700)]
Merge "Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev am:
9ef41ccf42" into pi-dev-plus-aosp
am:
74ecab8a44
Change-Id: I676fa766b26ecfc145ed4d5dd60b1af70dc99529
Tyler Gunn [Fri, 13 Jul 2018 19:45:28 +0000 (12:45 -0700)]
Merge "Make Connection#onSilence a public API." am:
cbe3737f13
am:
01ab0b90bf
Change-Id: I8c011d4a495d5240ebec83b07bc0b8f57a3c40ac
Jack Yu [Fri, 13 Jul 2018 19:38:03 +0000 (12:38 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into pi-dev-plus-aosp
am:
2e1eb41ec1 -s ours
Change-Id: I4614419886138038f4ee7c2fa317d012806d022c
Yueming Wang [Fri, 13 Jul 2018 19:36:51 +0000 (12:36 -0700)]
[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" am:
f92ad05fa5 -s ours
am:
6dd8f735d2 -s ours
Change-Id: I6cb9a490d20e71432ea7f6afd87ae58a5570d34e
Android Build Merger (Role) [Fri, 13 Jul 2018 19:30:22 +0000 (19:30 +0000)]
Merge "Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev am:
9ef41ccf42" into pi-dev-plus-aosp
Shrijana Ghimire [Fri, 13 Jul 2018 19:29:55 +0000 (12:29 -0700)]
Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev
am:
9ef41ccf42
Change-Id: I03291b3758127de3bfef480a6561930f5901014c
Jack Yu [Fri, 13 Jul 2018 19:28:23 +0000 (19:28 +0000)]
Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master
Jack Yu [Fri, 13 Jul 2018 19:28:11 +0000 (19:28 +0000)]
Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into pi-dev-plus-aosp
Bill Yi [Fri, 13 Jul 2018 19:25:30 +0000 (12:25 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
762470b663 -s ours
am:
f734167154 -s ours
Change-Id: Ifb7fb7717bcebd0a94e8906a539d6377a5f2b31f
Victor Hsieh [Fri, 13 Jul 2018 19:19:34 +0000 (12:19 -0700)]
Remove an unused parameter from InstallArgs.doRename
Test: build
Bug: None
Change-Id: I1244d18c2a54831366eeba35da07aee248e9e964
Tyler Gunn [Fri, 13 Jul 2018 19:15:45 +0000 (12:15 -0700)]
Merge "Make Connection#onSilence a public API."
am:
cbe3737f13
Change-Id: I4ab192ca160219770d7384e88c8e0025137b42bd
Yueming Wang [Fri, 13 Jul 2018 19:10:40 +0000 (12:10 -0700)]
[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
am:
f92ad05fa5 -s ours
Change-Id: If211a292335419751be21e670b1ddb489d3c54b4
Bill Yi [Fri, 13 Jul 2018 19:08:05 +0000 (12:08 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
762470b663 -s ours
Change-Id: If96f549175221087b8e5942ff286928b1bcb7f22
TreeHugger Robot [Fri, 13 Jul 2018 19:07:37 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE"
Shrijana Ghimire [Fri, 13 Jul 2018 19:03:24 +0000 (19:03 +0000)]
Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev