OSDN Git Service
Fabian Kozynski [Fri, 2 Nov 2018 23:46:04 +0000 (23:46 +0000)]
Merge "DO NOT MERGE Fixed size of buttons in switch user panel" into pi-dev
TreeHugger Robot [Fri, 2 Nov 2018 23:25:01 +0000 (23:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Fri, 2 Nov 2018 20:37:39 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idf4f50f8eca67e30c466635a126959fb5515dbc7
TreeHugger Robot [Fri, 2 Nov 2018 18:21:30 +0000 (18:21 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 2 Nov 2018 17:20:23 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 2 Nov 2018 17:08:20 +0000 (17:08 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 2 Nov 2018 16:54:41 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 2 Nov 2018 15:54:34 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 2 Nov 2018 15:41:36 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Fri, 2 Nov 2018 14:38:29 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iabf34af3136bdab888155ab61b413e75a7e9f7ea
Bill Yi [Fri, 2 Nov 2018 14:31:54 +0000 (07:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4937d3a35fc6bc106f05ced0f4eebfa919dc7ae1
Bill Yi [Fri, 2 Nov 2018 12:47:07 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I018ce29f4ec3ae26715ae9ce66144a2c9222906f
Bill Yi [Fri, 2 Nov 2018 12:40:30 +0000 (05:40 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2f3f2d4c18d8c4921d22d7c28dd672c3d7a6258a
Bill Yi [Fri, 2 Nov 2018 10:54:40 +0000 (03:54 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iac8c5017a5f148d4c7de9aeaf8127d5e10b86854
Bill Yi [Fri, 2 Nov 2018 10:41:58 +0000 (03:41 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5d2c2e7a3e5cbdf820afc71ea2a340eb502982f6
Bill Yi [Fri, 2 Nov 2018 10:35:11 +0000 (03:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia04ea97075ffea71bb2be920f7aa2df1684db7b2
Fabian Kozynski [Mon, 24 Sep 2018 13:25:51 +0000 (09:25 -0400)]
DO NOT MERGE Fixed size of buttons in switch user panel
Test: Accessibility Scanner
Fixes:
115582288
Change-Id: I1b02c06fa8d1461f9e26e8cca881cb3f2d0d8f1f
(cherry picked from commit
13155ef2f9b4bf5ae08459ae57f8f255801b1d9a)
Steve Elliott [Wed, 31 Oct 2018 22:07:29 +0000 (15:07 -0700)]
[automerger skipped] DO NOT MERGE ANYWHERE: resolve merge conflicts of
77c1f6080171bd02efe84501365495e98cae0a50 to oc-dr1-dev am:
d2fa9c3ecf -s ours
am:
e30c42e456 -s ours
Change-Id: I463ddbc2cf94f52d7b66d6dffb0b0c7233e8dfd3
Steve Elliott [Wed, 31 Oct 2018 22:01:22 +0000 (15:01 -0700)]
[automerger skipped] DO NOT MERGE ANYWHERE: resolve merge conflicts of
77c1f6080171bd02efe84501365495e98cae0a50 to oc-dr1-dev
am:
d2fa9c3ecf -s ours
Change-Id: I2043a8ca20cd09064bc21f2d8d8841ec7281dfdf
Steve Elliott [Fri, 26 Oct 2018 19:29:12 +0000 (15:29 -0400)]
DO NOT MERGE ANYWHERE: resolve merge conflicts of
77c1f6080171bd02efe84501365495e98cae0a50 to oc-dr1-dev
Bug:
111603898
Test: manual
Change-Id: I5933f27f2fbd90a6de447fbf7f17063f6b7f1fb8
Wesley Wang [Wed, 31 Oct 2018 02:58:09 +0000 (02:58 +0000)]
Merge "Fix Power Menu vanish when display size is Large" into pi-dev
TreeHugger Robot [Tue, 30 Oct 2018 22:22:14 +0000 (22:22 +0000)]
Merge "Be the current user to get A2DP proxy" into pi-dev
TreeHugger Robot [Tue, 30 Oct 2018 19:25:40 +0000 (19:25 +0000)]
Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev
TreeHugger Robot [Tue, 30 Oct 2018 18:34:26 +0000 (18:34 +0000)]
Merge "Use bilerp sampling when drawing TextureView with non-translate matrix" into pi-dev
Bill Yi [Sun, 28 Oct 2018 08:26:13 +0000 (01:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4a72b8f35ff02e45f0c746fc28ed7346cb59168f
TreeHugger Robot [Sat, 27 Oct 2018 14:26:30 +0000 (14:26 +0000)]
Merge "Fix persisted job handling in bad-boot-RTC situations" into pi-dev
Tim Murray [Mon, 22 Oct 2018 22:26:08 +0000 (15:26 -0700)]
ActivityThread: purge jemalloc at appropriate times
Don't let jemalloc sit around with unused pages.
Test: boots, works
bug
117795621
Change-Id: I1fc3fcf5aa2798c67ea8cada6eeec852b2bebee7
Amit Mahajan [Mon, 22 Oct 2018 17:43:34 +0000 (10:43 -0700)]
Adding new intent ACTION_SMS_MMS_DB_CREATED.
Test: manual (verified from logcat that intent is broadcast)
Bug:
115990430
Merged-in: I660cf2d04a1b57a58c8cefd212e5f8d73b329890
Change-Id: I660cf2d04a1b57a58c8cefd212e5f8d73b329890
(cherry picked from commit
8c1c45a710a4955b0add308c8c640f9c61a7db31)
Stan Iliev [Thu, 25 Oct 2018 20:28:27 +0000 (16:28 -0400)]
Use bilerp sampling when drawing TextureView with non-translate matrix
Draw TextureView with bilerp sampling, when the matrix is not
integer translate or identity. For example scaling matrix or
translation on X by 0.4f will draw with GL_LINEAR on OpenGL pipeline.
Translation on X by 3.0f will draw TextureView with GL_NEAREST.
Bug:
117890671
Test: Passed CtsViewTestCases and CtsUiRenderingTestCases
Change-Id: I72033410c8b0ab637c2e6b816ac9b04434286fbb
Merged-In: I3acd710ff2cb4ee7b14dd4b7d9227842187130c9
Bill Yi [Thu, 25 Oct 2018 09:47:52 +0000 (02:47 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib190758dc7e8929d33dc72a8c9deea2eeb6cc38b
Makoto Onuki [Wed, 24 Oct 2018 18:39:57 +0000 (11:39 -0700)]
Cherry-picking the following 3 getContentProviderImpl() CLs
- http://ag/
5163037
Fix a race in AMS.getContentProviderImpl().
If the provider process has just been killed by AM but appDiedLocked()
hasn't been called yet, this method would wait on the wrong
ContentProviderRecord.
- http://ag/
5201125
Fix getContentProviderImpl() permission issue
- http://ag/
5284403
Add timeout to AMS.getContentProviderImpl()
Bug:
116876013
Bug:
110030490
Test: manual test with the following debug code:
+ final String prop = "debug.am.provider.fake-kill." + cpr.proc.processName;
+ if (SystemProperties.getBoolean(prop, false)) {
+ cpr.proc.kill("fake-kill", true);
+ SystemProperties.set(prop, "0");
+ }
providerRunning = !cpr.proc.killed;
Then:
setprop debug.am.provider.fake-kill.android.process.acore 1
And launch the contacts app when acore is already running, and make sure
the timeout log shows up on logcat.
Test: Also do it with work profile contacts
Change-Id: I765d61a1b2719a92dff7db0162335f2c09c33421
Merged-in: I2c4ba1e87c2d47f2013befff10c49b3dc337a9a7
Merged-in: Ia35a9d36a34257873edbdcaefcf85d2373f3295e
Merged-in: Id5e7fff228d777eb0d1804654600d9ea156e36fd
Bill Lin [Wed, 24 Oct 2018 09:35:33 +0000 (09:35 +0000)]
Merge "Device show "No SIM card" and then showing carrier name during boot" into pi-dev
Steve Elliott [Tue, 23 Oct 2018 18:06:30 +0000 (11:06 -0700)]
[automerger skipped] DO NOT MERGE: Add configurable default setting for assistant componentname
am:
d5bed0f4b6 -s ours
Change-Id: Ic2a4a2d452d55ec87f678c7c4573b819aa145ebf
TreeHugger Robot [Tue, 23 Oct 2018 09:04:49 +0000 (09:04 +0000)]
Merge "AudioService: Add Hearing Aid Switch Control" into pi-dev
Wesley.CW Wang [Thu, 27 Sep 2018 12:41:31 +0000 (20:41 +0800)]
Fix Power Menu vanish when display size is Large
- Break the power button alignment when power menu height larger then screen height,
remove power menu padding and set gravity to center vertical within the screen.
Test: Manually, set display size or font size to large, larger or largest & check
power menu should be center vertical/horizontal when power menu height
larger then screen height.
Bug:
110761858
Change-Id: Ice7f816a30fa0f565a9098b3d6d5989aca9a4e5b
Merged-In: Ice7f816a30fa0f565a9098b3d6d5989aca9a4e5b
Daniel Sandler [Mon, 22 Oct 2018 13:42:07 +0000 (13:42 +0000)]
Merge "Add configurable default setting for assistant componentname" into pi-dev
Dan Sandler [Fri, 19 Oct 2018 22:12:40 +0000 (18:12 -0400)]
Add configurable default setting for assistant componentname
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.
(Note: this is a fix to Change-Id: Ib32daf that clarifies
the logic if R.string.config_defaultAssistantComponentName
has not been set in a given build.)
Test: manual
Bug:
111603898
Change-Id: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Merged-In: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
Jayachandran Chinnakkannu [Fri, 19 Oct 2018 20:32:41 +0000 (20:32 +0000)]
Merge "Add a new intent ACTION_MMSSMS_DATABASE_LOST" into pi-dev
Steve Elliott [Tue, 25 Sep 2018 15:23:38 +0000 (15:23 +0000)]
DO NOT MERGE: Add configurable default setting for assistant componentname
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.
Test: manual
Bug:
111603898
Change-Id: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Merged-In: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Steve Elliott [Tue, 25 Sep 2018 15:23:38 +0000 (15:23 +0000)]
DO NOT MERGE: Add configurable default setting for assistant componentname
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.
Test: manual
Bug:
111603898
Change-Id: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
Merged-In: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Jayachandran C [Thu, 18 Oct 2018 17:14:12 +0000 (10:14 -0700)]
Add a new intent ACTION_MMSSMS_DATABASE_LOST
This intent is to catch the mmssms.db getting mysteriously lost.
The is a hide@ API and is protected with MODIFY_PHONE_STATE permission.
Bug:
115990430
Test: Simulated mmsmsm.db corruption and verified that the intent is
broadcasted and received by application with MODIFY_PHONE_STATE
permission
Merged-in: I3474df294c550b503b74bde25f10ae43ab5863a1
Change-Id: I3474df294c550b503b74bde25f10ae43ab5863a1
Tim Murray [Fri, 19 Oct 2018 15:07:14 +0000 (15:07 +0000)]
Merge changes from topic "malloc-purge" into pi-dev
* changes:
wm: recycle bitmaps immediately in TaskSnapshotPersister
hwui: purge malloc pages on bitmap destruction
TreeHugger Robot [Fri, 19 Oct 2018 09:43:39 +0000 (09:43 +0000)]
Merge "Delay global alerts by 1s for high thresholds" into pi-dev
Tim Murray [Mon, 15 Oct 2018 23:50:23 +0000 (16:50 -0700)]
wm: recycle bitmaps immediately in TaskSnapshotPersister
Bitmap created in TaskSnapshotPersister are very short lived and
shouldn't be left around in the Java heap.
Test: boot, switch apps, works
bug
117795621
Merged-in: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8
Change-Id: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8
Tim Murray [Mon, 15 Oct 2018 23:29:15 +0000 (16:29 -0700)]
hwui: purge malloc pages on bitmap destruction
Immediately purge malloc pages on bitmap destruction. Bitmaps are often
big and can cause memory to stay high for much longer than it should.
Test: boots and works
bug
117795621
Merged-in: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
Change-Id: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
weichinweng [Tue, 9 Oct 2018 10:02:17 +0000 (18:02 +0800)]
AudioService: Add Hearing Aid Switch Control
1) Add setBluetoothHearingAidDeviceConnectionState interface to control
suppressNoisyIntent flag.
2) Add check to confirm the previous device is active or not when want
to clean it.
Bug:
112279820
Test: Build Pass, BT off/on when play A2DP, Switch active device
Change-Id: I73f1236d44213c6cf4a2708f3c96144416cfa67d
Merged-In: I73f1236d44213c6cf4a2708f3c96144416cfa67d
TreeHugger Robot [Wed, 17 Oct 2018 21:43:49 +0000 (21:43 +0000)]
Merge "Checks keyguard earlier when blocking notifications." into pi-dev
TreeHugger Robot [Wed, 17 Oct 2018 20:24:43 +0000 (20:24 +0000)]
Merge "DO NOT MERGE: Add configurable default setting for assistant componentname" into pi-dev
Bill Lin [Thu, 5 Jul 2018 09:48:49 +0000 (17:48 +0800)]
Device show "No SIM card" and then showing carrier name during boot
Keyguard default show NO SIM earlier than Telephony/Subscription callback
Refactor CarrierText & KeyguardUpdateMonitor
- Replace setup flag by resource attr(showMissingSim/showAirplaneMode)
- Remove setDiplayFlags API, and add mTelephonyCapable flag
- Implement MSG_TELEPHONY_CAPABLE in KeyguardUpdateMonitor
- Default do not show AirplaneMode & NO_SIM label unless define in xml
Bug:
111732320
Test: atest SystemUITests
atest frameworks/base/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
Manual:
1) Insert SIM and reboot device, only show "No Service"->"Operator"
2) Remove SIM and reboot device, only show "No SIM"
3) Enable AirplaneMode reboot, only show "Airplane mode"
4) Insert SIM and trigger sysui crash, state same as 1)
5) Remove SIM and trigger sysui crash, state same as 2)
6) Enable APM trigger sysui crash, state same as 3)
7) Enable APM & WFC, turn on wifi in keyguard showing
-> "Airplane mode" -> "" -> "WiFi Calling"
8) Enable APM & WFC, turn off wifi in keyguard showing
-> "Wifi Calling" -> "Airplane mode"
Change-Id: I4459997420484431751a4c088aa3856724affe6a
Merged-In: I4459997420484431751a4c088aa3856724affe6a
Steve Elliott [Tue, 25 Sep 2018 15:23:38 +0000 (15:23 +0000)]
DO NOT MERGE: Add configurable default setting for assistant componentname
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.
Test: manual
Bug:
111603898
Change-Id: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
Gus Prevas [Mon, 24 Sep 2018 21:15:32 +0000 (17:15 -0400)]
Checks keyguard earlier when blocking notifications.
This change modifies NotificationInfo to call the provided keyguard
callback when the "Stop notifications" button is tapped, rather than
when trying to save the new importance value after the undo timeout.
Test: updated test cases in NotificationInfoTest.
Bug:
111416533
Change-Id: I89b4715d0d41be4587753f554862e51c4e1d43c3
Merged-In: I89b4715d0d41be4587753f554862e51c4e1d43c3
(cherry picked from commit
533836ac7265b4f731f25fcc849378e9976a9fd5)
Fabian Kozynski [Wed, 17 Oct 2018 13:21:15 +0000 (13:21 +0000)]
Merge "DO NOT MERGE Fixes clipping on PagedTileLayout" into pi-dev
TreeHugger Robot [Wed, 17 Oct 2018 00:56:19 +0000 (00:56 +0000)]
Merge "audio: apply volume upon hearing aid device connection" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 14:20:55 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:43:27 +0000 (13:43 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:33:18 +0000 (13:33 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:31:26 +0000 (13:31 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:27:36 +0000 (13:27 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:26:19 +0000 (13:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:25:42 +0000 (13:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:23:48 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:22:32 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Chalard Jean [Wed, 22 Aug 2018 01:21:26 +0000 (10:21 +0900)]
Delay global alerts by 1s for high thresholds
This is a cherry-pick of aosp/735725 with a minor conflict.
By skipping updates if an alert is already scheduled, this avoids firing
the global alert too often on devices with high transfer speeds and high
quota.
Test: with tethering watching videos. Also runtest frameworks-net
Bug:
117243748
Change-Id: Ia0ed76141dfb33546529786eb0118138ef3708c2
Merged-In: Ie0ba5c1d1a2139606e63fcfe46ec77a89accd8d9
Merged-In: Iaabb31586e9e747871a526dc7ebb7deeb65d8f83
Bill Yi [Tue, 16 Oct 2018 08:48:38 +0000 (01:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I99af1ea374e4648979862922f7adea5d8b91ff81
Bill Yi [Tue, 16 Oct 2018 08:42:01 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I213983e8a9a9f554aa6fc0002c55e31248278614
Bill Yi [Tue, 16 Oct 2018 06:50:41 +0000 (23:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9da66855c6df5542a9d3273784941849a7d03693
Bill Yi [Tue, 16 Oct 2018 06:44:04 +0000 (23:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib157bd713ff9c0ad8504ff13a4ff4b91c75454be
Bill Yi [Tue, 16 Oct 2018 05:31:12 +0000 (22:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ice863cbfa1f7d3b678efc1c1c52023b1961e921a
Bill Yi [Tue, 16 Oct 2018 05:12:33 +0000 (22:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I26eb9affa49e0ec4a33d8af15636133eb55c926a
Bill Yi [Tue, 16 Oct 2018 05:05:45 +0000 (22:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib9833c6ccf62c26dfb73c08cd34b9a4d7178d7a9
Bill Yi [Tue, 16 Oct 2018 04:59:06 +0000 (21:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibf26d2b592cef0d579248cf122af92251819fe41
Bill Yi [Tue, 16 Oct 2018 04:46:13 +0000 (21:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I099acf9101592632383bc88dfff126c52f7965d0
Suren Baghdasaryan [Wed, 10 Oct 2018 21:22:20 +0000 (14:22 -0700)]
Request lmkd to purge its list of pids after establishing connection
lmkd keeps a list of pids registered by ActivityManager, however on rare
occasions when framework restarts and lmkd survives that list has to be
purged. Request lmkd to clear its pid list immediately after establishing
connection to it.
Bug:
116801366
Test: locally by killing zygote process
Change-Id: Id8c81e0cb0c4cf03b8faa0add5a9514fd3cd0c0c
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Jeff Sharkey [Fri, 12 Oct 2018 05:20:54 +0000 (22:20 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c am:
893598cd4b
am:
7656e1177f -s ours
Change-Id: I95387eef7f018aceec664807c015eef768fbb4b3
Jeff Sharkey [Fri, 12 Oct 2018 05:19:39 +0000 (22:19 -0700)]
[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8 am:
80c65f6ce7
am:
cef9bae62d -s ours
Change-Id: I5e2cb1a4274d547cfcd18fc010063fa70f75090f
Jeff Sharkey [Fri, 12 Oct 2018 05:14:40 +0000 (22:14 -0700)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c
am:
893598cd4b
Change-Id: Idfabe38c9b34fa6414e3f5a9188e917d29f316f2
Jeff Sharkey [Fri, 12 Oct 2018 05:09:55 +0000 (22:09 -0700)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8
am:
80c65f6ce7
Change-Id: I824cd0b4b0bdb66f9762fb9123f639fe3548f164
Jeff Sharkey [Fri, 12 Oct 2018 04:56:21 +0000 (21:56 -0700)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
am:
ab80221a8c
Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d
Jeff Sharkey [Fri, 12 Oct 2018 04:51:36 +0000 (21:51 -0700)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac
am:
af72f01db8
Change-Id: Ib260367aeaab863c9eeef492d46736dcf1c05591
Jeff Sharkey [Fri, 12 Oct 2018 04:31:20 +0000 (04:31 +0000)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
TreeHugger Robot [Fri, 12 Oct 2018 03:59:38 +0000 (03:59 +0000)]
Merge "Recover shady content:// paths." into pi-dev
Fabian Kozynski [Wed, 10 Oct 2018 16:52:35 +0000 (12:52 -0400)]
DO NOT MERGE Fixes clipping on PagedTileLayout
Manually cherry-picked from ag/
5161962 and ag/
5213435
Defines left and right bounds for clipping the pages of PagedTileLayout
with the same width as the padding in PagedTileLayout.TilePage.
Test: manual && atest
Change-Id: I5023d5a20749ad239036c316e035e31bed013cff
Fixes:
117096186
TreeHugger Robot [Thu, 11 Oct 2018 03:18:04 +0000 (03:18 +0000)]
Merge "Do not start VrManagerService if VR is not supported" into pi-dev
TreeHugger Robot [Thu, 11 Oct 2018 03:17:18 +0000 (03:17 +0000)]
Merge changes If834d0f0,I05ec75c7 into pi-dev
* changes:
Add null check for vrManager
Add null check for vrManager
TreeHugger Robot [Thu, 11 Oct 2018 03:17:12 +0000 (03:17 +0000)]
Merge "Add null check for vrManager" into pi-dev
Christopher Tate [Fri, 5 Oct 2018 22:53:50 +0000 (15:53 -0700)]
Fix persisted job handling in bad-boot-RTC situations
Persisted jobs were inadvertently being discarded rather than
rescheduled with appropriate time constraints. The underlying
bug is that the cancel-with-replacement code path was failing
to manage the replacement properly, and the other code path
leading to it was working around the bug by explicitly
rescheduling the job following cancellation.
Test: atest CtsJobSchedulerTestCases
Bug:
114292041
Bug:
117346686
Change-Id: I3a77e8a38c2f7028b61791bafd9c88b7a714ff6d
(cherry picked from commit
1603204ba5392d375e05ecf2c5b2fea7309f4cf1)
Oscar Shu [Wed, 10 Oct 2018 19:42:55 +0000 (19:42 +0000)]
Merge "proto change for wifi link layer usage stats" into pi-dev
Eric Laurent [Wed, 10 Oct 2018 00:45:58 +0000 (17:45 -0700)]
audio: apply volume upon hearing aid device connection
make sure hearing aid device volume is applied to music stream upon
hearing aid device connection.
Bug:
116145308
Test: repro steps in bug
Change-Id: Iccf6a78a0199c3a0b2aa80a39e7143bf715b261f
kopriva [Tue, 9 Oct 2018 20:42:28 +0000 (13:42 -0700)]
docs: fixing errors found with lint checker
through /bluetooth directory
amending through /content directory
Test: make ds-docs
Bug:
117494359
Change-Id: I751e15d60f0b9cc441998b27560050bf62994fef
Exempt-From-Owner-Approval: Docs-only change
TreeHugger Robot [Tue, 9 Oct 2018 20:04:29 +0000 (20:04 +0000)]
Merge "docs: fixing errors found with lint check" into pi-dev
kopriva [Tue, 9 Oct 2018 17:09:23 +0000 (10:09 -0700)]
docs: fixing errors found with lint check
This covers directories through /app.
removed unused import in KeyguardManager.java
Test: make ds-docs
Bug:
117494359
Change-Id: Ie2536676ae8d3ab9349aa43dc3e3248b618dd143
Exempt-From-Owner-Approval: Docs-only change
TreeHugger Robot [Tue, 9 Oct 2018 05:47:20 +0000 (05:47 +0000)]
Merge "docs: bug
37128155, broken link" into pi-dev
Mike Ma [Tue, 9 Oct 2018 05:45:17 +0000 (05:45 +0000)]
Merge "DO NOT MERGE: Fix signature of KernelCpuProcReader" into pi-dev
TreeHugger Robot [Tue, 9 Oct 2018 01:33:26 +0000 (01:33 +0000)]
Merge "docs: fixing 'mange' instead of 'manage'" into pi-dev
TreeHugger Robot [Tue, 9 Oct 2018 01:31:08 +0000 (01:31 +0000)]
Merge "docs: bug
37007350, missing word" into pi-dev
TreeHugger Robot [Tue, 9 Oct 2018 00:03:21 +0000 (00:03 +0000)]
Merge "Fix widget manager / alarm manager deadlock" into pi-dev
kopriva [Mon, 8 Oct 2018 22:57:00 +0000 (15:57 -0700)]
docs: fixing 'mange' instead of 'manage'
Test: make ds-docs
Bug:
117449040
Change-Id: I282a2e960bbf722bf3a72dd932e3bf685abb74e5
Exempt-From-Owner-Approval: Docs-only change
kopriva [Mon, 8 Oct 2018 22:21:07 +0000 (15:21 -0700)]
docs: bug
37007350, missing word
Test: make ds-docs
Bug:
37007350
Change-Id: Ibbff4232f67e7c955b182ff9f3b97250bb15c310
Exempt-From-Owner-Approval: Docs-only change
Kevin Hufnagle [Mon, 8 Oct 2018 20:20:18 +0000 (20:20 +0000)]
Merge "docs: Added callouts related to obsolete contacts data fields." into pi-dev
Kevin Hufnagle [Mon, 1 Oct 2018 14:04:44 +0000 (07:04 -0700)]
docs: Added callouts related to obsolete contacts data fields.
Also added callouts for fields that no longer sort results based on
contacts frequency.
Bug:
116422556
Test: make ds-docs -j32
Change-Id: I738e08bd4686e30b875fa37123ecebb4a5e179d3
Merged-In: Iddcd0b41b6ad991423a5ced78522a9ab2ad831a1