OSDN Git Service
dwchen [Mon, 20 Aug 2018 17:17:48 +0000 (10:17 -0700)]
Fixes possible issue with no-op creator.
Leaving a no-op CREATOR can lead to issues. We throw a run-time
exception to prevent anyone from using this. The StatsLogEventWrapper is
meant to be write-only since it's only used to send data to statsd.
Bug:
112550251
Test: Tested with provided POC app by external researcher.
Change-Id: I001d84e2a61a1cd8a4f59aa156ca52f73ad0f6e1
Makoto Onuki [Fri, 17 Aug 2018 23:33:50 +0000 (23:33 +0000)]
Merge "Default to FULL synchronous mode for sqlite DBs in system server" into pi-dev
Pavel Grafov [Fri, 17 Aug 2018 22:03:59 +0000 (22:03 +0000)]
Merge "Use DPM's counter for invalid password attempts" into pi-dev
Selim Cinek [Fri, 17 Aug 2018 21:37:04 +0000 (21:37 +0000)]
Merge "Fixed an issue where the message could be empty" into pi-dev
Makoto Onuki [Tue, 7 Aug 2018 22:57:13 +0000 (15:57 -0700)]
Default to FULL synchronous mode for sqlite DBs in system server
Test: change pin and immediately crash the kernel with
adb shell 'su root sh -c "echo c >/proc/sysrq-trigger"' and boot
Bug:
112175067
Change-Id: Ia5f43f3118e2297fbea43c805ef2f4577bf8a9bf
(cherry picked from commit
50e00c8dc48849280410e38bb05a1f11ce24ef01)
Laura Davis [Fri, 17 Aug 2018 20:58:43 +0000 (20:58 +0000)]
Merge "Docs: Inserted links to relevant guide pages." into pi-dev
TreeHugger Robot [Fri, 17 Aug 2018 20:58:35 +0000 (20:58 +0000)]
Merge "Ensure that popupTheme is always specified in the top-level theme." into pi-dev
Todd Kennedy [Fri, 17 Aug 2018 19:56:57 +0000 (12:56 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev am:
5b78b0015e am:
dff5d48b7e
am:
cc22fcc295 -s ours
Change-Id: Ie86f686d9216e04ddd11fd75b1fb5fa8a25ab751
Todd Kennedy [Fri, 17 Aug 2018 19:47:28 +0000 (12:47 -0700)]
Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev am:
5b78b0015e
am:
dff5d48b7e
Change-Id: I4e419bcce7375da6b09c01c6a78e127de6dbf189
Todd Kennedy [Fri, 17 Aug 2018 19:19:09 +0000 (12:19 -0700)]
Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev
am:
5b78b0015e
Change-Id: I2da67334d41640ecac6f2b9b31c93d16ee48dc22
TreeHugger Robot [Fri, 17 Aug 2018 18:56:28 +0000 (18:56 +0000)]
Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev
TreeHugger Robot [Fri, 17 Aug 2018 18:04:44 +0000 (18:04 +0000)]
Merge "Fix memory leak in ApplicationStates" into pi-dev
Laura Davis [Fri, 10 Aug 2018 22:46:06 +0000 (15:46 -0700)]
Docs: Inserted links to relevant guide pages.
This is the proof of concept for adding relevant
links in API pages to narrative content.
The design doc is hosted at:
https://docs.google.com/document/d/1Y6bFua27Gs7ONZ27gz0nHz3Djv0WND_V_rX-XvbeB3U/edit?usp=sharing
Test: make ds-docs
Bug:
112478848
Change-Id: Ic3842629c802fe89582d4d7b4a153e54d4ba1713
TreeHugger Robot [Thu, 16 Aug 2018 23:00:33 +0000 (23:00 +0000)]
Merge "Camera: Documentation update to remove physicalIds" into pi-dev
Shuzhen Wang [Wed, 15 Aug 2018 21:01:45 +0000 (14:01 -0700)]
Camera: Documentation update to remove physicalIds
Public API doesn't see android.logicalcam.physicalIds. Remove it
from public doc.
Bug:
112655222
Test: make offline-sdk-docs
Change-Id: Idf6958fb7c117912e33ece4fbaed04cb8e5e14c0
Hall Liu [Thu, 16 Aug 2018 22:57:13 +0000 (22:57 +0000)]
Merge "Add carrier config for auto redialing 911" into pi-dev
Pavel Grafov [Wed, 15 Aug 2018 14:45:31 +0000 (15:45 +0100)]
Use DPM's counter for invalid password attempts
Currently Keyguard uses separate counter for invalid password attempts
that is not persisted and is always initialized to zero after boot,
so if the user made several attempts and rebooted the device, the
device will show more allowed attempts before wipe than actually
available. The counter is also incorrectly reset to zero when
fingerprint is used successfully.
With this CL the same counter is used for that message and for actual
wipe triggering, it is persisted and is not reset upon reboot or
fingerprint authehtication.
Counting failed password attempts should be available in DevicePolicyManager
even without PackageManager.FEATURE_DEVICE_ADMIN.
Test: manual, tried using fingerprint and rebooting.
Bug:
112588257
Merged-In: I1f4012a95c6f6758885206f69e7ebe2c3704a567
Change-Id: I1f4012a95c6f6758885206f69e7ebe2c3704a567
Eric Laurent [Thu, 16 Aug 2018 01:42:21 +0000 (01:42 +0000)]
Merge "add config option for safe volume warning" into pi-dev
Beverly Tai [Thu, 16 Aug 2018 01:15:11 +0000 (01:15 +0000)]
Merge "DO NOT MERGE: Ensure zen SystemConditions are subscribed" into pi-dev
TreeHugger Robot [Wed, 15 Aug 2018 23:16:52 +0000 (23:16 +0000)]
Merge "Addition of HW Revision to Wifi metrics" into pi-dev
Mihai Popa [Wed, 15 Aug 2018 22:03:11 +0000 (15:03 -0700)]
[automerger skipped] Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into oc-dev am:
fc28b6b724 -s ours am:
e88da3d679 -s ours
am:
ffec86ff23 -s ours
Change-Id: Idf8692b0d521c7c7082bd242318a3e1c3d8c5ceb
Mihai Popa [Wed, 15 Aug 2018 21:49:03 +0000 (14:49 -0700)]
[automerger skipped] Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev am:
d5e6e1e83e -s ours am:
e82c4b82cc -s ours
am:
55ff3c76c5 -s ours
Change-Id: Ib2c05b9de6ab2984ea3dcc86e8b6eae9a4e95f83
Mihai Popa [Wed, 15 Aug 2018 21:38:07 +0000 (14:38 -0700)]
[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into oc-dev am:
e385255db4 am:
06829a62b1 -s ours
am:
3585690047 -s ours
Change-Id: I3990f8533376209673b25f714e154bd94147b91b
Mihai Popa [Wed, 15 Aug 2018 21:01:02 +0000 (14:01 -0700)]
[automerger skipped] Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into oc-dev am:
fc28b6b724 -s ours
am:
e88da3d679 -s ours
Change-Id: Ic3ad5eefc164ba31cd4f256b9ee39d8bc3aa1d5a
Siddharth Ray [Sat, 11 Aug 2018 00:36:17 +0000 (17:36 -0700)]
Addition of HW Revision to Wifi metrics
BUG:
112541087
Change-Id: If71584373f2a62c7c915c3dec3777d02878b7fda
Merged-In: If71584373f2a62c7c915c3dec3777d02878b7fda
Mihai Popa [Wed, 15 Aug 2018 20:48:07 +0000 (13:48 -0700)]
[automerger skipped] Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev am:
d5e6e1e83e -s ours
am:
e82c4b82cc -s ours
Change-Id: I1b7c3d8c456fa438233fa0884567b06f3b63eb4f
Mihai Popa [Wed, 15 Aug 2018 20:38:40 +0000 (13:38 -0700)]
[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into oc-dev am:
e385255db4
am:
06829a62b1 -s ours
Change-Id: I9563f6fc8afa112e8a8455ffde9a221432cbcbf9
Mihai Popa [Wed, 15 Aug 2018 20:04:26 +0000 (13:04 -0700)]
[automerger skipped] Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into oc-dev
am:
fc28b6b724 -s ours
Change-Id: I74179d805d746ccbb32546fb268cb52c8c9db514
Mihai Popa [Wed, 15 Aug 2018 19:53:33 +0000 (12:53 -0700)]
[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into oc-mr1-dev
am:
2cd112082b -s ours
Change-Id: I075c5213415607a56dff509e79c76e089f6df04e
Mihai Popa [Wed, 15 Aug 2018 19:52:34 +0000 (12:52 -0700)]
[automerger skipped] Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev
am:
d5e6e1e83e -s ours
Change-Id: Ie4fb9ca93c435f53cfe6db23b4902b094506b618
Kevin Hufnagle [Wed, 15 Aug 2018 19:47:34 +0000 (19:47 +0000)]
Merge "docs: Added units for AccessibilityServiceInfo#notificationTimeout." into pi-dev
Mihai Popa [Wed, 15 Aug 2018 19:43:55 +0000 (12:43 -0700)]
Merge "Fix crash during cursor moving on BiDi text" into oc-dev
am:
e385255db4
Change-Id: Ib094039b1c515af77fcc3c051352de5cb15861cb
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into oc-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573 am:
7693ce7eaf am:
11ba74cce9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573 am:
7693ce7eaf
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:17:04 +0000 (19:17 +0000)]
Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a am:
8f85f5ffd2
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:16:40 +0000 (19:16 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into oc-dev
Mihai Popa [Wed, 15 Aug 2018 19:16:21 +0000 (19:16 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into oc-mr1-dev
Mihai Popa [Wed, 15 Aug 2018 19:16:02 +0000 (19:16 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into pi-dev
Android Build Merger (Role) [Wed, 15 Aug 2018 19:13:15 +0000 (19:13 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a am:
8f85f5ffd2
Change-Id: If854f61c2516a61ac36426c10eafd30bf638e919
Android Build Merger (Role) [Wed, 15 Aug 2018 19:13:10 +0000 (19:13 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a
Change-Id: I7cb6623befc84f76e783b8800aa18ce28a8cc2b7
Android Build Merger (Role) [Wed, 15 Aug 2018 19:13:04 +0000 (19:13 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4
Change-Id: I16bff43cf755e443ed53f7a45469351c498f977f
Android Build Merger (Role) [Wed, 15 Aug 2018 19:12:59 +0000 (19:12 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3
Change-Id: Iaf0aded3004f33fdb52dd0c19779329991b24746
Android Build Merger (Role) [Wed, 15 Aug 2018 19:12:52 +0000 (19:12 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb
Change-Id: I221d974ba9402c088235d5bdb3c94e91cf4167ba
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug:
78464361,
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit
960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug:
78464361,
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit
960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug:
78464361,
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit
960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug:
78464361,
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit
960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
TreeHugger Robot [Wed, 15 Aug 2018 18:59:12 +0000 (18:59 +0000)]
Merge "Add HW Revision to GNSS Metrics" into pi-dev
TreeHugger Robot [Wed, 15 Aug 2018 18:53:16 +0000 (18:53 +0000)]
Merge "Fix symmetric key generation in strongbox" into pi-dev
Alan Viverette [Fri, 10 Aug 2018 14:08:34 +0000 (10:08 -0400)]
Ensure that popupTheme is always specified in the top-level theme.
Also adds missing contextPopupMenuStyle definition.
Bug:
112398006
Test: manual
Change-Id: If9b5d765b5b6e05d66397eda5838916f933e7132
Kevin Hufnagle [Wed, 15 Aug 2018 00:44:53 +0000 (17:44 -0700)]
docs: Added units for AccessibilityServiceInfo#notificationTimeout.
This field uses "milliseconds" as the time unit.
Test: make ds-docs -j32
Bug:
36949594
Change-Id: Id2e55ed7c96364913bb7ad028798fad5f976d3ca
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:36 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573 am:
7693ce7eaf am:
11ba74cce9
Change-Id: Ia5fad0a4e89e6ff44c546ab71f37f657a3313f0d
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:30 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573 am:
7693ce7eaf
Change-Id: Ic311029be8ab99f4aaae526d980da0f2436c5459
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:23 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573
Change-Id: I4122a5c548c4b3395bb546c459c34f10b319ad29
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:16 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55
Change-Id: I680848db0e845617323ecca36c380fdf890789d9
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:09 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
Change-Id: I27b2220f568a37ff16b0dfc3376d7e46cb3659c9
Android Build Merger (Role) [Wed, 15 Aug 2018 00:28:52 +0000 (00:28 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
Change-Id: Ic801a54fa6cb048ddf911c7b315849ab40bd7a52
Android Build Merger (Role) [Wed, 15 Aug 2018 00:28:41 +0000 (00:28 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
Change-Id: If1607fb19bd806cb6d0f9b9010032e95df6549a8
Android Build Merger (Role) [Wed, 15 Aug 2018 00:26:19 +0000 (00:26 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
Change-Id: I6995aab201805b64e81022db295356ef8abda30c
Android Build Merger (Role) [Wed, 15 Aug 2018 00:26:10 +0000 (00:26 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Change-Id: Id97c3f508a0dcd82978b06891b3a979921d4be3a
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug:
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Selim Cinek [Wed, 15 Aug 2018 00:24:45 +0000 (17:24 -0700)]
Fixed an issue where the message could be empty
We're now making sure that the last message can never be too short
and we will therefore always see at least one message
Bug:
111576198
Test: Send message with "Text\r\n"
Change-Id: I4db0708511c45710540653501c845df5dd813545
Atanas Kirilov [Tue, 14 Aug 2018 21:40:47 +0000 (14:40 -0700)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into oc-dev am:
9d85c1ff53 am:
3f4c1ece82
am:
f0d9a094d2
Change-Id: I9e66651d9ef14a832b12c45a043466a1f9757606
Atanas Kirilov [Tue, 14 Aug 2018 21:29:50 +0000 (14:29 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev am:
5315bbfbc7 am:
02d1a54dcf
am:
3b8808869a -s ours
Change-Id: I73c45e48807b6c188a6258f6a758ec358b0d024b
Atanas Kirilov [Tue, 14 Aug 2018 20:46:06 +0000 (13:46 -0700)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into oc-dev am:
9d85c1ff53
am:
3f4c1ece82
Change-Id: I0df7f7f048ebdc8fbfc608ec8e532fbf9fa3a866
Atanas Kirilov [Tue, 14 Aug 2018 20:36:38 +0000 (13:36 -0700)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev am:
5315bbfbc7
am:
02d1a54dcf
Change-Id: Id2ce7a146a5fc65e8c9c24560376a387cef76ca0
Atanas Kirilov [Tue, 14 Aug 2018 20:16:40 +0000 (13:16 -0700)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into oc-dev
am:
9d85c1ff53
Change-Id: I96184594285add35eacbac8e61da3120e4ce67a1
Joshua Baxter [Tue, 14 Aug 2018 20:02:53 +0000 (20:02 +0000)]
Merge "docs: fixed typo" into pi-dev
Atanas Kirilov [Tue, 14 Aug 2018 19:59:29 +0000 (12:59 -0700)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev
am:
5315bbfbc7
Change-Id: Ibde8da5add8ee9e51c03b1ebb68b80313a7a5bb6
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3 skipped:
c565a7f7e2
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-mr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-dr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into nyc-dev
Atanas Kirilov [Tue, 14 Aug 2018 19:40:14 +0000 (19:40 +0000)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev
Atanas Kirilov [Tue, 14 Aug 2018 19:40:04 +0000 (19:40 +0000)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into pi-dev
Beverly [Tue, 14 Aug 2018 13:43:11 +0000 (09:43 -0400)]
DO NOT MERGE: Ensure zen SystemConditions are subscribed
Test: ZenModeHelperTest
Bug:
112500368
Change-Id: I5ac4edcee5a6dc7c4877aa147016c09e53a0b033
TreeHugger Robot [Tue, 14 Aug 2018 18:22:49 +0000 (18:22 +0000)]
Merge "Update WebView#clearClientCertPreferences docs." into pi-dev
Laura Davis [Tue, 14 Aug 2018 17:59:30 +0000 (17:59 +0000)]
Merge "Docs: Removed narrative content and edited links." into pi-dev
TreeHugger Robot [Tue, 14 Aug 2018 14:09:20 +0000 (14:09 +0000)]
Merge "Update WebBackForwardList javadoc." into pi-dev
TreeHugger Robot [Tue, 14 Aug 2018 13:43:46 +0000 (13:43 +0000)]
Merge "Clarify WebView's lack of plugin support." into pi-dev
Torne (Richard Coles) [Thu, 28 Jun 2018 23:33:27 +0000 (19:33 -0400)]
Clarify WebView's lack of plugin support.
Update docs to clarify that plugins are in fact not supported from K
onward and that enabling them doesn't do anything.
Bug:
112579915
Test: m offline-sdk-docs
Change-Id: I8678ea716be0adc4cd3a6fae1b4776e312ec29e0
(cherry picked from commit
1676c95ddc1562cf6826027f96b64e0ab739ed50)
TreeHugger Robot [Mon, 13 Aug 2018 23:12:59 +0000 (23:12 +0000)]
Merge "docs: fixed typo" into pi-dev
Siddharth Ray [Mon, 13 Aug 2018 17:25:53 +0000 (10:25 -0700)]
Add HW Revision to GNSS Metrics
Test:
adb shell dumpsys location
Hardware Version: EVT2.0
BUG:
112541087
Change-Id: I6278188f15f22ff7b4f5cc30c4c225e0f95ec53d
Joshua Baxter [Mon, 13 Aug 2018 22:46:02 +0000 (22:46 +0000)]
Merge "docs: fixed typo" into pi-dev
Joshua Baxter [Mon, 13 Aug 2018 22:43:17 +0000 (22:43 +0000)]
Merge "docs: fixed typo" into pi-dev
Torne (Richard Coles) [Wed, 20 Jun 2018 19:31:49 +0000 (15:31 -0400)]
Update WebView#clearClientCertPreferences docs.
Remove the reference to the specific ACTION_STORAGE_CHANGED intent as
other intents are used instead on newer OS versions; just note that it's
cleared automatically when the keychain is updated and don't specify the
exact mechanism.
Change-Id: Ic677832a1384e0eb2498d06e7aa34507fd2e7278
Fixes:
30371615
Test: make offline-sdk-docs
(cherry picked from commit
01eb1282138b8c06351efa7e91baac6f98c54660)
Torne (Richard Coles) [Tue, 19 Jun 2018 20:29:54 +0000 (16:29 -0400)]
Update WebBackForwardList javadoc.
Update javadoc for WebBackForwardList and WebHistoryItem. Remove
references to history items being updated as this no longer occurs, and
clarify in clone() that there's no need to acutally do this any more.
Also remove a bunch of implementation notes about
atomicity/synchronisation that are being rendered attached to the return
value and likely aren't even true any more, let alone relevant to
developers.
Bug:
74593032
Test: make offline-sdk-docs
Change-Id: I4ce33133d2ff18e7376d768c7a2e076ecd2a8b95
(cherry picked from commit
8949046528941e593c3b03c2f67fc323d6ae1fa9)
Eric Laurent [Tue, 31 Jul 2018 01:45:21 +0000 (18:45 -0700)]
add config option for safe volume warning
Add boolean configuration option config_safe_media_disable_on_volume_up
to customize the behavior of safe volume warning dialog:
- When true the dialog can be dismissed with a single press on Vol+ key
(default AOSP behavior)
- When false it cannot.
Initially disabled for Vodaphone DE, UK, ES and IT.
Bug:
65155536
Bug:
111667485
Test: make
Change-Id: I538d91e570fc962c93264db000dfcfdce90da1f0
TreeHugger Robot [Fri, 10 Aug 2018 21:01:52 +0000 (21:01 +0000)]
Merge "Sending BATTERY_LEVEL_CHANGED when plug type changes" into pi-dev
Jeff Sharkey [Fri, 10 Aug 2018 19:52:50 +0000 (12:52 -0700)]
[automerger skipped] Merge changes from topic "back111085900" into oc-dev am:
f0095ec4d6 am:
5e8e47d4f8
am:
3375c14aef -s ours
Change-Id: I345878aeec43a19778f70e0bf325b3e278bab682
Jeff Sharkey [Fri, 10 Aug 2018 19:46:36 +0000 (12:46 -0700)]
[automerger skipped] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
5a55a72fcd am:
628667ac86
am:
d270842f22 -s ours
Change-Id: I6bf1c307208a1db1bdb67574801a472dbc27f97d
Jeff Sharkey [Fri, 10 Aug 2018 19:45:27 +0000 (12:45 -0700)]
[automerger skipped] [automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8 am:
424304f893 am:
b2e2b1386f skipped:
a2ad2596b7 am:
4ccfb1d0aa am:
efe1afbf93
am:
2adafa92bc -s ours
Change-Id: Iec62f49c864d2380025b9a64dab868bcce7512fc
Jeff Sharkey [Fri, 10 Aug 2018 19:44:12 +0000 (12:44 -0700)]
[automerger skipped] [automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4 am:
97d0d2c209 am:
ca5fd693bc skipped:
19d2af61df am:
f5c1a7ca27 am:
b2ed78a197
am:
798655e2e1 -s ours
Change-Id: I8c70a90fc10d8707b65e09ccddfe3acb984d3d92
Jeff Sharkey [Fri, 10 Aug 2018 19:28:13 +0000 (12:28 -0700)]
Merge changes from topic "back111085900" into oc-dev am:
f0095ec4d6
am:
5e8e47d4f8
Change-Id: I251eeddbbd73f0747920d757d6a210d0d5b772f5
Jeff Sharkey [Fri, 10 Aug 2018 19:23:42 +0000 (12:23 -0700)]
DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
5a55a72fcd
am:
628667ac86
Change-Id: I8f8645a99e8b3bd07cd82722b8af888d46955030
Jeff Sharkey [Fri, 10 Aug 2018 19:20:08 +0000 (12:20 -0700)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8 am:
424304f893 am:
b2e2b1386f skipped:
a2ad2596b7 am:
4ccfb1d0aa
am:
efe1afbf93
Change-Id: I7ebe940777eba8ee575a0f970b462e447f241d53
Jeff Sharkey [Fri, 10 Aug 2018 19:12:07 +0000 (12:12 -0700)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4 am:
97d0d2c209 am:
ca5fd693bc skipped:
19d2af61df am:
f5c1a7ca27
am:
b2ed78a197
Change-Id: I695962bed5fdd932b434244a5c50d33dce34f08b
Jeff Sharkey [Fri, 10 Aug 2018 18:12:36 +0000 (11:12 -0700)]
Merge changes from topic "back111085900" into oc-dev
am:
f0095ec4d6
Change-Id: Ie563f7c17a201dadfe8a6696d2cf99aebc07b855
Jeff Sharkey [Fri, 10 Aug 2018 18:05:51 +0000 (11:05 -0700)]
DO NOT MERGE. Execute "strict" queries with extra parentheses.
am:
5a55a72fcd
Change-Id: I4be4620726e30ca4131320bde074a2e572c51a42
OSDN Git Service
