OSDN Git Service
TreeHugger Robot [Sat, 13 Jan 2018 02:32:04 +0000 (02:32 +0000)]
Merge "Prevent race condition when iterating over bound services"
TreeHugger Robot [Sat, 13 Jan 2018 02:02:39 +0000 (02:02 +0000)]
Merge "Turn on app info v2 feature."
Lucas Dupin [Sat, 13 Jan 2018 01:13:26 +0000 (01:13 +0000)]
Merge "Allow custom keyguard "prompt reason""
TreeHugger Robot [Sat, 13 Jan 2018 00:56:41 +0000 (00:56 +0000)]
Merge "PhoneWindowManager: allow force default rotation for TV"
TreeHugger Robot [Sat, 13 Jan 2018 00:46:25 +0000 (00:46 +0000)]
Merge "Change scan flags before applying policy"
TreeHugger Robot [Sat, 13 Jan 2018 00:41:56 +0000 (00:41 +0000)]
Merge "Remove @hide for KEYCODE_ALL_APPS"
TreeHugger Robot [Sat, 13 Jan 2018 00:34:42 +0000 (00:34 +0000)]
Merge "Screenshot global actions item."
Mohamed Abdalkader [Sat, 13 Jan 2018 00:32:17 +0000 (00:32 +0000)]
Merge "Add unique id for sms APIs to be able to trigger correct smstracker"
TreeHugger Robot [Sat, 13 Jan 2018 00:21:28 +0000 (00:21 +0000)]
Merge "Used LinkAddress insteaad of InterfaceAddress"
Richard Ledley [Sat, 13 Jan 2018 00:15:19 +0000 (00:15 +0000)]
Merge "Set selection bounds when we try to copy, so it will work with nonselectable text."
TreeHugger Robot [Sat, 13 Jan 2018 00:09:29 +0000 (00:09 +0000)]
Merge "Create /data/misc/stats-data/ and /data/misc/stats-service/ in statsd.rc rather than during the runtime of statsd"
Doris Ling [Sat, 13 Jan 2018 00:02:27 +0000 (16:02 -0800)]
Turn on app info v2 feature.
Bug:
69384089
Test: rebuild
Change-Id: I362de6232fa0cc790f4884e2fec9715342882167
TreeHugger Robot [Fri, 12 Jan 2018 23:48:41 +0000 (23:48 +0000)]
Merge "Add Permission performance tests"
Shikhar Srivastav [Fri, 12 Jan 2018 23:39:32 +0000 (23:39 +0000)]
Merge "Add VDSO global setting and mapping to sys property."
Yifan Hong [Fri, 12 Jan 2018 23:37:34 +0000 (23:37 +0000)]
Merge "android.os.VintfObject: update for VNDK version format change." am:
eac8c121fe am:
d9b9d49a66
am:
bb2d749981
Change-Id: I330d9cd4fe23b62a605bd95790046c2e0b1aebb0
TreeHugger Robot [Fri, 12 Jan 2018 23:31:15 +0000 (23:31 +0000)]
Merge "Add performance test for BroadcastReceiver"
Android Build Merger (Role) [Fri, 12 Jan 2018 23:28:28 +0000 (23:28 +0000)]
Merge "Merge "Bluetooth in band ring" am:
c9082cecb3 am:
cb87262975 am:
d0e8859123"
TreeHugger Robot [Fri, 12 Jan 2018 23:27:55 +0000 (23:27 +0000)]
Merge "Fix object pool for lifecycler"
Joseph Pirozzo [Fri, 12 Jan 2018 23:27:25 +0000 (23:27 +0000)]
Merge "Bluetooth in band ring" am:
c9082cecb3 am:
cb87262975
am:
d0e8859123
Change-Id: Icc37bbcf039497b9fa14406038764240ec6dcd4d
Yifan Hong [Fri, 12 Jan 2018 23:22:02 +0000 (23:22 +0000)]
Merge "android.os.VintfObject: update for VNDK version format change." am:
eac8c121fe
am:
d9b9d49a66
Change-Id: I69512885ec3372e45f775bb7f6a8b828f8be490e
TreeHugger Robot [Fri, 12 Jan 2018 23:20:58 +0000 (23:20 +0000)]
Merge "Remove @SystemApi from the fields of R.styleable"
Joseph Pirozzo [Fri, 12 Jan 2018 23:11:03 +0000 (23:11 +0000)]
Merge "Bluetooth in band ring" am:
c9082cecb3
am:
cb87262975
Change-Id: I7d2b7843fd74e4505085ef693e4dc47d791b115a
Hall Liu [Fri, 12 Jan 2018 23:11:03 +0000 (23:11 +0000)]
Merge "Use proper classloader when reading from parcel" am:
d3cb6380a4 am:
03a515aed4
am:
ff63c83237
Change-Id: If91f694b4f9c396e118dcf47ebaa480ff4cd44d0
Yifan Hong [Fri, 12 Jan 2018 23:05:35 +0000 (23:05 +0000)]
Merge "android.os.VintfObject: update for VNDK version format change."
am:
eac8c121fe
Change-Id: Ia32c4395546ef58dee88bfbae77ea52d506a1c63
Hall Liu [Fri, 12 Jan 2018 23:01:16 +0000 (23:01 +0000)]
Merge "Use proper classloader when reading from parcel" am:
d3cb6380a4
am:
03a515aed4
Change-Id: I65070de075e8d09512d771c805c82043f04b3275
Joseph Pirozzo [Fri, 12 Jan 2018 22:58:42 +0000 (22:58 +0000)]
Merge "Bluetooth in band ring"
am:
c9082cecb3
Change-Id: I819b5510c45612b25d4fc1101d358f6d77691f12
Hall Liu [Fri, 12 Jan 2018 22:48:14 +0000 (22:48 +0000)]
Merge "Use proper classloader when reading from parcel"
am:
d3cb6380a4
Change-Id: I79c21859aa657b7a61e5cc8e7d60f79f736f34be
Todd Kennedy [Fri, 12 Jan 2018 22:41:03 +0000 (14:41 -0800)]
Change scan flags before applying policy
Change-Id: I902e4d8eb4297e1d03ebc6d492773e1e10605689
Fixes:
71891222
Test: sideload GMS core and reboot
Test: notice that GMS core remained system & privileged and kept all of its permissions
Alison Cichowlas [Wed, 6 Dec 2017 15:51:21 +0000 (10:51 -0500)]
Screenshot global actions item.
Refactor TakeScreenshot code out of PhoneWindowManager;
add power menu item for Screenshot.
Test: runtest systemui
Change-Id: Ie8602386cd59f8fd991369d2117f7c4d76f65e41
TreeHugger Robot [Fri, 12 Jan 2018 22:27:35 +0000 (22:27 +0000)]
Merge "Remove bogus SkASSERT"
TreeHugger Robot [Fri, 12 Jan 2018 22:26:03 +0000 (22:26 +0000)]
Merge "Rename trySetQuietModeEnabled to requestQuietModeEnabled as per ... the feedback from API council"
Tony Mak [Fri, 12 Jan 2018 12:10:17 +0000 (12:10 +0000)]
Rename trySetQuietModeEnabled to requestQuietModeEnabled as per ...
the feedback from API council
trySetQuietModeEnabled will be kept for a while until next
Launcher prebuilt is dropped.
FIXES:
71818127
Test: Build
Change-Id: I3d4fd64862c7d924b8da630522a30a3899676b4b
Treehugger Robot [Fri, 12 Jan 2018 22:12:39 +0000 (22:12 +0000)]
Merge "android.os.VintfObject: update for VNDK version format change."
TreeHugger Robot [Fri, 12 Jan 2018 22:12:26 +0000 (22:12 +0000)]
Merge "Skip "sync didn't run" WTF when job is stopped too soon"
Joseph Pirozzo [Fri, 12 Jan 2018 22:11:50 +0000 (22:11 +0000)]
Merge "Bluetooth in band ring"
Jeff Hamilton [Fri, 12 Jan 2018 21:55:33 +0000 (21:55 +0000)]
Merge "Minor LoadedApk refactoring." am:
6ca155f8c2 am:
e6fee297a2
am:
2fd131b492 -s ours
Change-Id: Idd758a3b1e0f18812c67187ab820859b239d1834
yro [Fri, 12 Jan 2018 08:00:15 +0000 (00:00 -0800)]
Create /data/misc/stats-data/ and /data/misc/stats-service/ in statsd.rc
rather than during the runtime of statsd
The purpose of this change is to prevent causing selinux violation by
trying to mkdir to /data/misc/ directory when statsd doesn't have
permission to do so.
Bug:
71537285
Test: manually tested to make sure that there's no sepolicy violation
Change-Id: I9c4ccecc416f41923c9b24dd44a388d135fecc07
Jeff Hamilton [Fri, 12 Jan 2018 21:43:44 +0000 (21:43 +0000)]
Merge "Minor LoadedApk refactoring." am:
6ca155f8c2
am:
e6fee297a2
Change-Id: I919f7e7e11b64f6155919f7ea631f3f6fd84ce03
TreeHugger Robot [Fri, 12 Jan 2018 21:32:55 +0000 (21:32 +0000)]
Merge "Add target package to VisualVoicemailFilterSettings."
Jeff Hamilton [Fri, 12 Jan 2018 21:30:13 +0000 (21:30 +0000)]
Merge "Minor LoadedApk refactoring."
am:
6ca155f8c2
Change-Id: I96fb0215bc09e2c190900be47dcca4de2c752d47
Kodlee Yin [Fri, 12 Jan 2018 21:20:54 +0000 (21:20 +0000)]
Merge "Create Notification.Action.SemanticAction intdef."
Andrii Kulian [Wed, 10 Jan 2018 23:32:31 +0000 (15:32 -0800)]
Fix object pool for lifecycler
The original implementation of object pool for lifecycle
transactions tried to always recycle objects after a
transaction was scheduled. In case when a client was running
in the same process this lead to objects being emptied before
it could actually perform the transaction.
Also when checking if object was already in the pool we should
use "==" instead of equality check.
Bug:
70554032
Bug:
71346774
Test: com.android.server.am.ClientLifecycleManagerTests
Test: android.app.servertransaction.ObjectPoolTests
Change-Id: I85fb3dae4589c2390e00a37144da0d285d16d151
TreeHugger Robot [Fri, 12 Jan 2018 21:04:20 +0000 (21:04 +0000)]
Merge "Fix destruction order of NinePatchPeeker"
TreeHugger Robot [Fri, 12 Jan 2018 21:03:24 +0000 (21:03 +0000)]
Merge "Create an empty stub for Vulkan readback"
Shikhar Srivastav [Wed, 10 Jan 2018 00:58:36 +0000 (16:58 -0800)]
Add VDSO global setting and mapping to sys property.
This will help us run P/H experiments by controlling the VDSO
system property through P/H.
Bug:
70518189
Test: Will manually test it later through opt-in P/H experiment.
Change-Id: I95fd51085aed229358e2cefd472da1116c6073b3
TreeHugger Robot [Fri, 12 Jan 2018 20:57:05 +0000 (20:57 +0000)]
Merge "Add another pass of commont lint rules."
TreeHugger Robot [Fri, 12 Jan 2018 20:56:43 +0000 (20:56 +0000)]
Merge "Expose Global.LOW_POWER_MODE for CTS"
Hall Liu [Fri, 12 Jan 2018 20:56:36 +0000 (20:56 +0000)]
Merge "Use proper classloader when reading from parcel"
Treehugger Robot [Fri, 12 Jan 2018 20:52:14 +0000 (20:52 +0000)]
Merge "Minor LoadedApk refactoring."
Mohamed Abdalkader [Fri, 12 Jan 2018 19:52:31 +0000 (11:52 -0800)]
Add unique id for sms APIs to be able to trigger correct smstracker
In old APIs the SmsTracker itself was being passed to the RIL
and onSendComplete the tracker's pending intent was triggered
and then the updated messageRef was used as the id.
Instead of passing the tracker, passing a unique id to be used
for the lifetime of the message.
Doing same thing for receiving flow.
Test: None, APIs not exercised yet.
BUG=
69846044
Change-Id: Id19f854e2c48649db8f2031ee4f49cdac331451c
Makoto Onuki [Thu, 11 Jan 2018 23:51:23 +0000 (15:51 -0800)]
Skip "sync didn't run" WTF when job is stopped too soon
Job scheduler may call onStopJob() right after onStartJob() when a
constraint is no longer satisfied. In that case this WTF shouldn't fire.
Bug:
71866667
Test: manual test (trigger some syncs)
Change-Id: I2ba3b076b60692b02019f3e74b384aea63e27bb4
TreeHugger Robot [Fri, 12 Jan 2018 20:09:34 +0000 (20:09 +0000)]
Merge "Force verifying updated priv apps on boot if enabled"
TreeHugger Robot [Fri, 12 Jan 2018 20:00:34 +0000 (20:00 +0000)]
Merge "DND alarms only will not mute alarms nor media"
TreeHugger Robot [Fri, 12 Jan 2018 19:54:55 +0000 (19:54 +0000)]
Merge "Keep PowerUI low-battery logic in sync with BatteryService."
Holly Jiuyu Sun [Fri, 12 Jan 2018 19:52:48 +0000 (19:52 +0000)]
Merge "Add dependencies of EuiccCard." am:
90b4e47d94 am:
4f217d740a
am:
e03f92daaf
Change-Id: Ibc22bc94851e4faf6066f44baebaf2da8eec586e
Badhri Jagan Sridharan [Fri, 12 Jan 2018 19:46:10 +0000 (19:46 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am:
22f4a681f9 -s ours am:
1ac5184053
am:
5a26231e39 -s ours
Change-Id: I52f02086bc92ac347249e935697fadcf6fb4c410
Holly Jiuyu Sun [Fri, 12 Jan 2018 19:42:42 +0000 (19:42 +0000)]
Merge "Add dependencies of EuiccCard." am:
90b4e47d94
am:
4f217d740a
Change-Id: I874b4244dd0c79c1bee34480c34d6ee6ac9e0855
Badhri Jagan Sridharan [Fri, 12 Jan 2018 19:36:56 +0000 (19:36 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am:
22f4a681f9 -s ours
am:
1ac5184053
Change-Id: I9dc40770783686b9b3db57275c8a1bbab97a7a9a
Holly Jiuyu Sun [Fri, 12 Jan 2018 19:27:22 +0000 (19:27 +0000)]
Merge "Add dependencies of EuiccCard."
am:
90b4e47d94
Change-Id: I68393a909c22a49a3905dd2b50577c4c88655ca1
Badhri Jagan Sridharan [Fri, 12 Jan 2018 19:22:13 +0000 (19:22 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager"
am:
22f4a681f9 -s ours
Change-Id: I8fdb25956710600d75a0f2eb0bbf82a94fc78131
TreeHugger Robot [Fri, 12 Jan 2018 19:16:22 +0000 (19:16 +0000)]
Merge "Battery saver: Expose location power save mode as system API"
Jeff Sharkey [Fri, 12 Jan 2018 19:12:27 +0000 (12:12 -0700)]
Add another pass of commont lint rules.
-- Parcelables should be inflated through CREATOR
-- Methods with no arguments should throw ISE
-- Examine constructors for Executors
-- Listeners should always be last for lambdas
-- Verify naming of UserHandle methods
-- Verify naming of Params objects
-- Verify naming of Context service constants
-- Verify tense of enabled methods
Better exception tracking.
Test: manual inspection
Bug:
37784434,
37749454,
37705832
Bug:
37705176,
37536230,
37533040,
71866617
Change-Id: If2f19784c46a4d99f54577a7365babfd357ca3f7
Todd Kennedy [Fri, 12 Jan 2018 19:11:56 +0000 (19:11 +0000)]
Merge "Revert "Temporary debugging""
Todd Kennedy [Fri, 12 Jan 2018 19:11:26 +0000 (19:11 +0000)]
Revert "Temporary debugging"
This reverts commit
c170e20c6f8ff40876887f3d74e2caec0caef6f5.
Change-Id: I251b6e108b386559605973ca0ef21d805ffe00a3
Jeff Hamilton [Tue, 24 Oct 2017 19:20:43 +0000 (15:20 -0400)]
Minor LoadedApk refactoring.
- Rename varaibles holding LoadedApk to make the code easier to read.
- Move resource creation into LoadedApk, consolidating the logic.
(cherry picked from commit
7541ca4d1aa48e3110187a83a8dccbfa72084148)
Test: manual
Merged-In: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
Change-Id: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
Leon Scroggins III [Fri, 12 Jan 2018 18:11:10 +0000 (13:11 -0500)]
Fix destruction order of NinePatchPeeker
Test: build with SK_DEBUG
SkAndroidCodec is going to unref the NinePatchPeeker, so make sure it
gets destructed first, before destructing the NinePatchPeeker.
Change-Id: I5bb412f1a20abd44004552e0d788a016bc4a24ae
Makoto Onuki [Fri, 12 Jan 2018 18:32:32 +0000 (10:32 -0800)]
Expose Global.LOW_POWER_MODE for CTS
Bug:
68769804
Test: atest CtsBatterySavingTestCases
Change-Id: I7dfac2e0c549c91cd368ca955fff71e15d585b34
Leon Scroggins III [Fri, 12 Jan 2018 18:25:40 +0000 (13:25 -0500)]
Remove bogus SkASSERT
Test: No change in behavior, no new tests
SkASSERT compiles to nothing in typical Android builds, but with
SK_DEBUG defined it is an assert. This assert attempts to call a method
that no longer exists. Remove it.
Change-Id: I7047bb66c4cc0f0bdd6a84562247eed48944739e
Kodlee Yin [Thu, 21 Dec 2017 22:07:15 +0000 (22:07 +0000)]
Create Notification.Action.SemanticAction intdef.
Currently, Notification.Action has no indication of what it will do
when the associated PendingIntent is triggered. SemanticAction will
allow app developers to specify what the Action will do. This is
useful, for example, in the case where a user wants to answer an
incoming message in a hands-free manor. As, potentially, the
Notification may contain multiple actions like Reply, Mark as Read,
etc, this hands-free application would need to differentiate the
reply Action from the Mark as Read action. SemanticAction would
provide a means to do so.
Test: runtest -x
core/tests/coretests/src/android/app/NotificationTest.java
Bug:
67717177
Bug:
70859253
Change-Id: I8179afdd5da77be0037a8c03e125d8178cecc568
TreeHugger Robot [Fri, 12 Jan 2018 18:17:26 +0000 (18:17 +0000)]
Merge "Follow some slice refactors"
Victor Hsieh [Fri, 6 Oct 2017 21:44:52 +0000 (14:44 -0700)]
Force verifying updated priv apps on boot if enabled
If ro.apk_verity.mode is non-zero (default 0), package manager
will force verifying updated priv apps in /data, and make sure the
certificate matches the original one in /system, which we trust.
Test: logcat shows force collecting cert only if enabled
Bug:
30972906
Change-Id: I33f98930aaaaf76dbe2c0bc664e841f7892eb00e
Izabela Orlowska [Fri, 12 Jan 2018 18:06:40 +0000 (18:06 +0000)]
Merge "AAPT2: always compile 9patch files"
Arthur Eubanks [Mon, 18 Dec 2017 21:46:59 +0000 (13:46 -0800)]
Add performance test for BroadcastReceiver
This is intended to be the first of multiple performance tests around
ActivityManager.
This also refactors some of the existing performance utils so that a
BenchmarkState which accepts the elapsed time rather than measures it
can be added (ManualBenchmarkState).
This test measures the current time, sends a Broadcast, the target APK
receives it, measures the current time, and sends its measured time
back to the test APK.
Test: m ActivityManagerPerfTestsTestApp ActivityManagerPerfTests
Test: adb install $OUT/data/app/ActivityManagerPerfTestsTestApp/ActivityManagerPerfTestsTestApp.apk
Test: adb install $OUT/data/app/ActivityManagerPerfTests/ActivityManagerPerfTests.apk
Test: adb shell am instrument -w -e class \
com.android.frameworks.perftests.am.tests.BroadcastPerfTest \
com.android.frameworks.perftests.amtests/android.support.test.runner.AndroidJUnitRunner
Bug:
67460485
Change-Id: Ib1606ff60c6a845088bde5bd1a33294765b88b36
Holly Jiuyu Sun [Fri, 12 Jan 2018 17:18:03 +0000 (17:18 +0000)]
Merge "Add dependencies of EuiccCard."
Stan Iliev [Fri, 12 Jan 2018 16:50:29 +0000 (11:50 -0500)]
Create an empty stub for Vulkan readback
Create a stub for Vulkan readback. This avoids crashing,
because OpenGL readback does not work for Vulkan.
Test: Ran calc and gmail apps with skiavk pipeline.
Change-Id: I11cddde0a1efae1aa549e7a47d01051ec975f470
Badhri Jagan Sridharan [Fri, 12 Jan 2018 15:36:08 +0000 (15:36 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager"
Jerry Zhang [Fri, 1 Dec 2017 03:10:55 +0000 (19:10 -0800)]
DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager
Cherry-pick from
30b9adfad1c5055044f0b585782b10f764e0ddf9
The screen unlocked functions save effort on setting
the usb config during each connection. These
functions persist between connections and between
boots. When the screen is unlocked and these
functions are set, the current functions will
be automatically set to the screen unlocked functions.
Also added svc command for this so it can be
used and tested while the UI is worked on.
Bug:
62876645
Test: svc usb setScreenUnlockedFunctions mtp
Test: Test functions with locking, unlocking, and
disconnecting, with no lockscreen, swipe, and pattern
Change-Id: Ia05e095917166d25398c4d310b02971e3a1bb12a
Sami Kyostila [Fri, 12 Jan 2018 15:03:22 +0000 (15:03 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint" am:
f0561142f3 am:
8f919b8c5b
am:
0944889164 -s ours
Change-Id: I1dc35e30d0eb333a96a0e6b045ec7ebe43fb9a5b
Beverly [Thu, 11 Jan 2018 20:28:33 +0000 (15:28 -0500)]
DND alarms only will not mute alarms nor media
Test: runtest -x frameworks/base/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java
Change-Id: Id95912059e67107e8bb2fd9a77709f1ee3c183b2
Fixes:
71779870
Sami Kyostila [Fri, 12 Jan 2018 14:47:24 +0000 (14:47 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint" am:
f0561142f3
am:
8f919b8c5b
Change-Id: Ic8e741ec39fc83cdd64ce313d5d66fdbaa1e7ebc
Izabela Orlowska [Fri, 12 Jan 2018 14:24:09 +0000 (14:24 +0000)]
AAPT2: always compile 9patch files
Test: existing tests
Bug:
70578281
Change-Id: I7ffcbdd664108348182e71d01b1680e2399ec37c
Jason Monk [Wed, 10 Jan 2018 01:37:27 +0000 (20:37 -0500)]
Follow some slice refactors
Test: make
Bug:
68378561
Change-Id: Ifcf2b426f4984d8dda257b55e59d6da7e8d38237
Sami Kyostila [Fri, 12 Jan 2018 14:16:10 +0000 (14:16 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint"
am:
f0561142f3
Change-Id: I4c707c676f03048b9130b140c25b3b9c58ec06ce
Narayan Kamath [Fri, 12 Jan 2018 13:18:57 +0000 (13:18 +0000)]
Merge "BatteryStats: Remove dead code."
Treehugger Robot [Fri, 12 Jan 2018 12:39:35 +0000 (12:39 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint"
Joachim Sauer [Fri, 12 Jan 2018 11:25:32 +0000 (11:25 +0000)]
Merge "Add default value for new time zone picker flag."
Sami Kyostila [Thu, 11 Jan 2018 00:12:14 +0000 (00:12 +0000)]
base: Convert libs/services/Android.mk into a blueprint
Convert libs/services/Android.mk into a blueprint module so it can be
linked by other blueprint modules.
Test: mmm frameworks/base
Change-Id: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
Merged-In: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
Sami Kyostila [Fri, 12 Jan 2018 11:03:23 +0000 (11:03 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint"
Richard Ledley [Fri, 12 Jan 2018 10:40:20 +0000 (10:40 +0000)]
Merge "Make Linkify links clickable in nonselectable text."
Richard Ledley [Thu, 4 Jan 2018 15:30:50 +0000 (15:30 +0000)]
Set selection bounds when we try to copy, so it will work with nonselectable text.
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug: b/
67629726
Change-Id: I685ae3527685665eb3b50aaea90a570ebec47fd7
Chalard Jean [Fri, 12 Jan 2018 09:11:07 +0000 (09:11 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes" am:
2fef505e1e am:
a3373bd461
am:
176adeaeda
Change-Id: I81ee1269db73a158eedcc41a6d426abfb9130783
Chalard Jean [Fri, 12 Jan 2018 08:46:39 +0000 (08:46 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes" am:
2fef505e1e
am:
a3373bd461
Change-Id: Ie8d38267581ab3e1bdf4b5373487a2375f8649ed
Chalard Jean [Fri, 12 Jan 2018 08:32:34 +0000 (08:32 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes"
am:
2fef505e1e
Change-Id: I10be317ba9e6ac1fc6c30eda3db2c3b6b4adabe0
Hyunyoung Song [Fri, 12 Jan 2018 06:11:43 +0000 (06:11 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607 am:
69d240d584 am:
3aab9561b2
am:
7ca6bb95de
Change-Id: I449dd9403f7f9eeb92def3ce7162be07971399e2
Hyunyoung Song [Fri, 12 Jan 2018 05:55:42 +0000 (05:55 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607 am:
69d240d584
am:
3aab9561b2
Change-Id: I554c6f320ec32b0151097701a5ff3a8d48161d7f
TreeHugger Robot [Fri, 12 Jan 2018 05:47:04 +0000 (05:47 +0000)]
Merge "Big RecoverableKeyStoreLoader refactoring."
Hyunyoung Song [Fri, 12 Jan 2018 05:44:25 +0000 (05:44 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607
am:
69d240d584
Change-Id: I02bf540b41fd9fd026fbe0fad4069526664cd56f
Hyunyoung Song [Fri, 12 Jan 2018 05:31:38 +0000 (05:31 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
am:
48df033607
Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465
TreeHugger Robot [Fri, 12 Jan 2018 05:23:45 +0000 (05:23 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
Jack Yu [Thu, 11 Jan 2018 20:44:07 +0000 (12:44 -0800)]
Used LinkAddress insteaad of InterfaceAddress
Also removed InterfaceAddress which was added
in aosp/561351 since LinkAddress is exactly same
as InterfaceAddress.
Test: Telephony sanity tests
bug:
64132030
Change-Id: Ib7965a44b307c4cff2581abf0b7c12fcb1b9526a