OSDN Git Service
Tyler Gunn [Tue, 8 Sep 2015 23:03:58 +0000 (23:03 +0000)]
Merge "IMS: Capabilities propagation" into mnc-vt-dev
Android Git Automerger [Tue, 8 Sep 2015 22:04:55 +0000 (22:04 +0000)]
am
3bed3bf4: am
92aeac34: am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
3bed3bf498eadcaa760608a415c66e017d2eb690':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 22:04:49 +0000 (22:04 +0000)]
am
d35c7940: am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
d35c7940112fa7edae03a1b43670157787a69d3d':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 21:55:50 +0000 (21:55 +0000)]
am
92aeac34: am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
92aeac3499e91985a266590aff88b06a9633b667':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:55:46 +0000 (21:55 +0000)]
am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
2c31a0d774cebb9603d3dd7f904af20dce4f3bd4':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 21:46:08 +0000 (21:46 +0000)]
am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
1c88f605629a5f1647a8af1fdcfe0fb6e3eea847':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:46:02 +0000 (21:46 +0000)]
am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 21:37:33 +0000 (21:37 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
b/
22822607
Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
Cheryl Potter [Tue, 8 Sep 2015 21:36:35 +0000 (21:36 +0000)]
am
4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs
* commit '
4b32b3f43fe8e27ffdb19d51364ebd99a3503e79':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:28:06 +0000 (21:28 +0000)]
Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs
xin He [Tue, 8 Sep 2015 21:09:23 +0000 (21:09 +0000)]
am
ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
* commit '
ee1babecd204def48feb1fcf648dbed5cd760697':
Introduce config_wifi_revert_country_code_on_cellular_loss
xin He [Tue, 8 Sep 2015 21:01:49 +0000 (21:01 +0000)]
Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
Jorim Jaggi [Tue, 8 Sep 2015 20:50:58 +0000 (20:50 +0000)]
am
5e8e1c63: Do not expand notifications with expand gesture when disallowed
* commit '
5e8e1c63774da8c013fad18a63eac691cdc9646f':
Do not expand notifications with expand gesture when disallowed
Jorim Jaggi [Fri, 4 Sep 2015 18:51:26 +0000 (11:51 -0700)]
Do not expand notifications with expand gesture when disallowed
Bug:
23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
b/
22822607
Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
Geoff Mendal [Mon, 7 Sep 2015 15:38:29 +0000 (15:38 +0000)]
am
9f3e169c: (-s ours) Import translations. DO NOT MERGE
* commit '
9f3e169c3a6277187fe00abc2eaa08d5872160ef':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Sep 2015 15:31:05 +0000 (08:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifcce22af4c5736023ed78b34be3a420ec6c6738d
Auto-generated-cl: translation import
Cheryl Potter [Fri, 4 Sep 2015 22:51:18 +0000 (22:51 +0000)]
am
24a6be46: am
36866dc7: am
4afcda74: am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
24a6be463e5628416ad234a3e2e33f1f4cc5b287':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 22:51:12 +0000 (22:51 +0000)]
am
8f2a5b25: am
1edd4ebc: am
a8b9a2b7: am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
8f2a5b257603971405ce94a57d26dc26233b20db':
Minor fix on Auto Desktop Head Unit doc.
Cheryl Potter [Fri, 4 Sep 2015 22:45:57 +0000 (22:45 +0000)]
am
36866dc7: am
4afcda74: am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
36866dc7347ba37ced74af6f8a6298c62282dacb':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 22:45:53 +0000 (22:45 +0000)]
am
1edd4ebc: am
a8b9a2b7: am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
1edd4ebce50a653f3d1454114f5cd73edcace903':
Minor fix on Auto Desktop Head Unit doc.
Cheryl Potter [Fri, 4 Sep 2015 22:35:43 +0000 (22:35 +0000)]
am
4afcda74: am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
4afcda743d0ba14ee0d3449e7f15518f3cc538dc':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 22:35:36 +0000 (22:35 +0000)]
am
a8b9a2b7: am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
a8b9a2b7aeab97f71ff876319d807d9f151c6065':
Minor fix on Auto Desktop Head Unit doc.
Cheryl Potter [Fri, 4 Sep 2015 22:24:55 +0000 (22:24 +0000)]
am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
79ad6310ea3ca5931013cf746babf55cf391cc8f':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 22:24:48 +0000 (22:24 +0000)]
am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
81e0dff0da637f3580ac81e86950b23e9a55bbdc':
Minor fix on Auto Desktop Head Unit doc.
Cheryl Potter [Fri, 4 Sep 2015 22:14:25 +0000 (22:14 +0000)]
Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
Vinit Deshpande [Fri, 4 Sep 2015 22:01:23 +0000 (15:01 -0700)]
Introduce config_wifi_revert_country_code_on_cellular_loss
This setting allows wifi country code to automatically reset
to default (i.e. ro.boot.wificountrycode property value) when
cellular modem loses MCC
bug:
21795172
Change-Id: I20bd3a260b639dba331305c6baa39ffb52e2fd6f
Robert Greenwalt [Fri, 4 Sep 2015 22:06:21 +0000 (22:06 +0000)]
am
8e285f2f: Merge "Cut down some logs." into mnc-dr-dev
* commit '
8e285f2f74460b1b4bc9ba0faa3c94540f5ab92c':
Cut down some logs.
Robert Greenwalt [Fri, 4 Sep 2015 21:51:50 +0000 (21:51 +0000)]
Merge "Cut down some logs." into mnc-dr-dev
Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:19:03 +0000 (16:19 +0000)]
am
566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev
* commit '
566886f7973b86196174e925f16d26975c16a09b':
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
Sungmin Choi [Fri, 4 Sep 2015 16:09:03 +0000 (16:09 +0000)]
am
4c97f3a4: Do not show roaming icon for some operators of Chile
* commit '
4c97f3a45a3ba345d630e282c07c5126128514eb':
Do not show roaming icon for some operators of Chile
Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:09:02 +0000 (16:09 +0000)]
Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev
Sungmin Choi [Thu, 3 Sep 2015 20:20:46 +0000 (13:20 -0700)]
Do not show roaming icon for some operators of Chile
Bug:
23775352
Change-Id: Ie86c628e4acb8fe4b4d24feec98f5a9227c9346c
Robert Greenwalt [Thu, 3 Sep 2015 23:41:45 +0000 (16:41 -0700)]
Cut down some logs.
bug:
23623327
Change-Id: I737d4e6c384bf4da62c65ad2abe0c9b5dca0067a
Andre Eisenbach [Fri, 4 Sep 2015 00:13:07 +0000 (00:13 +0000)]
am
1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '
1d5e2e291d4c3fbcde1425af74644a24c94e1577':
Bluetooth: Fix profile auto-connect logic
Andre Eisenbach [Fri, 4 Sep 2015 00:02:57 +0000 (00:02 +0000)]
Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
Andre Eisenbach [Thu, 3 Sep 2015 22:20:09 +0000 (15:20 -0700)]
Bluetooth: Fix profile auto-connect logic
The fix in commit
05e08c3a2f27d5027b34e81b7c0a67e4da7341f6 caused a
duplicate connect message to be sent to A2DP devices (and others),
causing the A2DP state machine to disconnect a device shortly after
connecting it.
This patch reverts the relevant part of commit 05e06c that causes the
faulty auto-connect behaviour.
Bug:
22128169
Change-Id: Ie0dadd5c9583bf2b64a8434a2a3603cb749b21d0
Dan Stoza [Thu, 3 Sep 2015 22:03:20 +0000 (22:03 +0000)]
am
0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
0b887e579b766012c09626e7089a3fade5415ee6':
SurfaceControl: Add colorTransform to DisplayInfo
Dan Stoza [Thu, 3 Sep 2015 21:55:36 +0000 (21:55 +0000)]
Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
Amit Mahajan [Thu, 3 Sep 2015 21:40:00 +0000 (21:40 +0000)]
am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
8a670f1da434c4720b08dbb62c635316e593b9b3':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Amit Mahajan [Thu, 3 Sep 2015 21:24:46 +0000 (21:24 +0000)]
Merge changes from topic 'TDSCDMA support' into mnc-dr-dev
* changes:
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Dan Stoza [Mon, 31 Aug 2015 19:01:48 +0000 (12:01 -0700)]
SurfaceControl: Add colorTransform to DisplayInfo
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.
Bug:
20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
Adrian Roos [Thu, 3 Sep 2015 19:48:20 +0000 (19:48 +0000)]
am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
34411e8fecab310a0402bd77e8fe5a5a488a783a':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 19:48:13 +0000 (19:48 +0000)]
am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
95200e6f4eb34818ac0b652167cffacfcfb4fdff':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:42:39 +0000 (19:42 +0000)]
Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev
Adrian Roos [Thu, 3 Sep 2015 19:41:22 +0000 (19:41 +0000)]
Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
Adrian Roos [Wed, 2 Sep 2015 20:23:30 +0000 (13:23 -0700)]
Don't disable fingerprint when entering wrong credential
Bug:
23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
Adrian Roos [Wed, 2 Sep 2015 20:26:25 +0000 (13:26 -0700)]
Poke fingerprint timeout when vold password is correct
Bug:
23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813
Adrian Roos [Thu, 3 Sep 2015 19:08:58 +0000 (19:08 +0000)]
am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
1b5cc3a4ba46029b798adb9e362d87df5673bc52':
Show face unlock even when fingerprint is running
Adrian Roos [Thu, 3 Sep 2015 18:59:37 +0000 (18:59 +0000)]
Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
Ian Pedowitz [Thu, 3 Sep 2015 18:01:30 +0000 (18:01 +0000)]
am
7d223aee: am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
7d223aeef8c9108210e0d13e9458b4d701781ee0':
Don't crash on (invalid) hardware address lengths > 127.
Svetoslav Ganov [Thu, 3 Sep 2015 18:00:52 +0000 (18:00 +0000)]
am
0b5162c8: am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
0b5162c85f01f8451120e7ad82aa7193850862f7':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 18:00:46 +0000 (18:00 +0000)]
am
d4ef34ce: am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
d4ef34ce8d9cfb351e1a063ce2ff354ee0b9c13b':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Ian Pedowitz [Thu, 3 Sep 2015 17:34:50 +0000 (17:34 +0000)]
am
0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '
0a76afb93e6f303921ab84e2f26747c3ebf19b62':
Don't crash on (invalid) hardware address lengths > 127.
Ian Pedowitz [Thu, 3 Sep 2015 17:22:21 +0000 (17:22 +0000)]
Merge "Don't crash on (invalid) hardware address lengths > 127." into mnc-dev
Svetoslav Ganov [Thu, 3 Sep 2015 17:17:46 +0000 (17:17 +0000)]
am
6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '
6dd856b1ea31bae083b6c2ed40af812c41b3a6cf':
Don't drop runtime permissions on older system app update.
Wale Ogunwale [Thu, 3 Sep 2015 17:17:42 +0000 (17:17 +0000)]
am
512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '
512141d581133ad5c1712ac097dcee08d46bae2c':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Svetoslav Ganov [Thu, 3 Sep 2015 17:08:57 +0000 (17:08 +0000)]
Merge "Don't drop runtime permissions on older system app update." into mnc-dev
Wale Ogunwale [Thu, 3 Sep 2015 17:06:03 +0000 (17:06 +0000)]
Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
Michael Wright [Thu, 3 Sep 2015 14:11:06 +0000 (14:11 +0000)]
am
8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '
8ae90587a510f72a176119b1f23add8bc36285b9':
Add TabletModeChangedListener for SystemUI.
Michael Wright [Thu, 3 Sep 2015 14:00:52 +0000 (14:00 +0000)]
Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
Lorenzo Colitti [Thu, 3 Sep 2015 08:36:20 +0000 (17:36 +0900)]
Don't crash on (invalid) hardware address lengths > 127.
These would cause us to crash with a NegativeArraySizeException
when trying to create the clientMac array. Instead, if the length
is > 16 (invalid, because the field is only 16 bytes long), fudge
it to 6 (Ethernet / wifi). This is a bit less liberal than the
legacy client, which doesn't check the length at all.
Bug:
23725795
Change-Id: I83f47bfc400ffa8ce85dd9d1b8eb96be5afe51a5
Adrian Roos [Wed, 2 Sep 2015 20:29:42 +0000 (13:29 -0700)]
Show face unlock even when fingerprint is running
Bug:
23318158
Change-Id: I02b085297c2546c814d97d725d18beba79568b33
Jim Miller [Wed, 2 Sep 2015 23:19:28 +0000 (23:19 +0000)]
am
bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev
* commit '
bd5b61c489fb0543c8db29030e57189c273010eb':
Fingerprint should throttle after 5 attempts
Jim Miller [Wed, 2 Sep 2015 23:07:58 +0000 (23:07 +0000)]
Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev
Jim Miller [Wed, 2 Sep 2015 22:35:33 +0000 (15:35 -0700)]
Fingerprint should throttle after 5 attempts
Fixes bug
23762058
Change-Id: I62665dd3097b8e71075a5eddbf34a551db1507d5
Daniel Estrada Alva [Wed, 2 Sep 2015 22:14:53 +0000 (22:14 +0000)]
am
90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev
* commit '
90738c2a7e85cd07ac2cf3ab61246b7745c8fb80':
Use private action for SUPL related connectivity changes.
Daniel Estrada Alva [Wed, 2 Sep 2015 22:04:30 +0000 (22:04 +0000)]
Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev
Wale Ogunwale [Wed, 2 Sep 2015 21:53:29 +0000 (14:53 -0700)]
Respect DONT_KILL_APP flag when bringing down a disabled service.
Commit
540e123 introduce logic to clean up states when a component is
disabled. For services this included marking the process running the
service as removed so it can be killed later. However, this wasn't
respecting the Intent.EXTRA_DONT_KILL_APP flag where the caller
doesn't want the process of the disabled component to be killed.
This change now takes the flag into account.
Bug:
23491822
Bug:
15804187
Change-Id: I54a6e03cd66164dc8c4606a3c462114fe661ea8e
Daniel Estrada Alva [Wed, 2 Sep 2015 21:12:13 +0000 (21:12 +0000)]
am
cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev
* commit '
cfd45ae4718934d403a17410ab6a7c722bdd01fc':
Add SUPL-specific network bcast
Christopher Tate [Wed, 2 Sep 2015 21:12:00 +0000 (21:12 +0000)]
am
7bae31f8: am
60aae166: Apply default link-handling policy at OTA from pre-M
* commit '
7bae31f88f8dcaf8114d9d43b29e154bc23374ad':
Apply default link-handling policy at OTA from pre-M
Daniel Estrada Alva [Wed, 2 Sep 2015 21:04:19 +0000 (21:04 +0000)]
Merge "Add SUPL-specific network bcast" into mnc-dr-dev
Christopher Tate [Wed, 2 Sep 2015 20:57:28 +0000 (20:57 +0000)]
am
60aae166: Apply default link-handling policy at OTA from pre-M
* commit '
60aae166e99dff0dba379e14c0fc43e89fd1a018':
Apply default link-handling policy at OTA from pre-M
Jorim Jaggi [Wed, 2 Sep 2015 20:53:27 +0000 (20:53 +0000)]
am
304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev
* commit '
304e3772273cd39ae55fbdc1c453d8fa50258670':
Fix wrong mode for fingerprint unlock when bouncer not showing
Svetoslav [Wed, 2 Sep 2015 20:53:05 +0000 (13:53 -0700)]
Don't drop runtime permissions on older system app update.
We have a device with an installed version of an app that is not
preinstalled and has some runtime permissions granted. Now we get
OTA with an older version of the app which does not request these
runtime permissions. We first scan system packages and then installed
apps. During the scan we encounter the newly appeared system package
and determine it is older than the one we have installed and disable
it.
However, before we disable the package we update the permissions
for this package but since the one on the system partition (the one
we found so far) doesn't request some of the runtime permissions
granted to the installed version of the app, they get dropped on the
floor. This grant attempt is not necessary as the permission the
installed package has depends entirely on the permissions it requests.
In this process we may look at the requested permissions on the
disabled system package but in general the updated package cannot
have a permission that it does not request regardless whether the
disabled system app requests it or on.
bug:
23718806
Change-Id: I187bc11750eb270c3233c314992186f5d58d9d82
Jorim Jaggi [Wed, 2 Sep 2015 20:43:04 +0000 (20:43 +0000)]
Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev
Christopher Tate [Wed, 2 Sep 2015 19:54:41 +0000 (12:54 -0700)]
Apply default link-handling policy at OTA from pre-M
Not just at first (wiped) boot.
Bug
23744303
Change-Id: I9ab42f7b081e92231d89b3c97935135c3dd901d4
Jorim Jaggi [Wed, 2 Sep 2015 18:53:02 +0000 (11:53 -0700)]
Fix wrong mode for fingerprint unlock when bouncer not showing
Bug:
23748205
Change-Id: I4c751fcbb99d1f409a1433309e795addf1a2232c
Pavel Zhamaitsiak [Wed, 2 Sep 2015 18:01:34 +0000 (11:01 -0700)]
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
Two arrays are passed from caller (in this case IMS service
implementation) to listener (in this case client of ImsManager).
Listener is not modifying arrays and caller is not expecting
data to be returned back.
Bug:
23749309
Change-Id: I6231cfd16852acfca88ee43e8538b2440058d774
Tim Kilbourn [Wed, 2 Sep 2015 17:49:42 +0000 (17:49 +0000)]
am
7cd6aaaf: am
ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
* commit '
7cd6aaafda35509607e945fcadc4a556f75ed23b':
Allow shell to disable keyguard when not secure
Tim Kilbourn [Wed, 2 Sep 2015 17:40:36 +0000 (17:40 +0000)]
am
ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
* commit '
ee72f99dd14c8e531cd1a114d162a49636e7b809':
Allow shell to disable keyguard when not secure
Tim Kilbourn [Wed, 2 Sep 2015 17:28:08 +0000 (17:28 +0000)]
Merge "Allow shell to disable keyguard when not secure" into mnc-dev
Clara Bayarri [Wed, 2 Sep 2015 10:10:56 +0000 (10:10 +0000)]
am
582b186c: am
f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
* commit '
582b186cd3b41c5c67649ae2ba9176c3860ab1ec':
Fix Custom action mode menu item onclick is not working
Clara Bayarri [Wed, 2 Sep 2015 09:59:36 +0000 (09:59 +0000)]
am
f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
* commit '
f7b220ab9f62be3d279e3fa7923c249ff0fa09f3':
Fix Custom action mode menu item onclick is not working
Clara Bayarri [Wed, 2 Sep 2015 09:31:06 +0000 (09:31 +0000)]
Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
Vineeta Srivastava [Wed, 2 Sep 2015 07:39:09 +0000 (07:39 +0000)]
am
dd124802: Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev
* commit '
dd124802a7220a813aeb5afe1b1d6ef1cb7277e2':
set config_use_sim_language_file false for KR LGU+/KT
Vineeta Srivastava [Wed, 2 Sep 2015 07:29:33 +0000 (07:29 +0000)]
Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev
Hyejin [Thu, 27 Aug 2015 03:26:22 +0000 (20:26 -0700)]
set config_use_sim_language_file false for KR LGU+/KT
BUG=
23611386
Change-Id: Ifb635ccab9994f0bc2c0a75b539f29d71111b1ed
Roshan Pius [Wed, 2 Sep 2015 06:13:06 +0000 (06:13 +0000)]
am
a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev
* commit '
a14e900181aa03daa760e3ba6eb1e7e00d438305':
Reformat only KR numbers with leading "+82".
Roshan Pius [Wed, 2 Sep 2015 06:06:45 +0000 (06:06 +0000)]
Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev
Selim Cinek [Wed, 2 Sep 2015 01:08:52 +0000 (01:08 +0000)]
am
2af5010a: am
36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev
* commit '
2af5010a6793d27eda86432f1ec3ebbe92e1d99e':
Fixed a crash in the notification group manager
Deepanshu Gupta [Wed, 2 Sep 2015 01:08:45 +0000 (01:08 +0000)]
am
0e150a8b: am
0c5fd7e3: am
eb541727: am
dd21212f: am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
0e150a8b947f657a5875382bd65f37b5a07c0f79':
LayoutLib: Fix typedArray caching.
Selim Cinek [Wed, 2 Sep 2015 00:54:32 +0000 (00:54 +0000)]
am
36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev
* commit '
36a75d6aefcddb91df7d513292d346f1f51ec702':
Fixed a crash in the notification group manager
Deepanshu Gupta [Wed, 2 Sep 2015 00:54:26 +0000 (00:54 +0000)]
am
0c5fd7e3: am
eb541727: am
dd21212f: am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
0c5fd7e3791f0b1a3a3b1c1ebe34f568155ba11f':
LayoutLib: Fix typedArray caching.
Jim Miller [Wed, 2 Sep 2015 00:40:58 +0000 (00:40 +0000)]
am
be342fc3: Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev
* commit '
be342fc3c7a21bf22901255ed489a90c00f8bd93':
Only allow foreground app and keyguard to access FingerprintManager
Jim Miller [Wed, 2 Sep 2015 00:32:11 +0000 (00:32 +0000)]
Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev
Selim Cinek [Wed, 2 Sep 2015 00:25:05 +0000 (00:25 +0000)]
Merge "Fixed a crash in the notification group manager" into mnc-dev
Deepanshu Gupta [Wed, 2 Sep 2015 00:11:24 +0000 (00:11 +0000)]
am
eb541727: am
dd21212f: am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
eb54172719db60740a0b8dde6380db54d4006159':
LayoutLib: Fix typedArray caching.
Selim Cinek [Wed, 2 Sep 2015 00:07:38 +0000 (17:07 -0700)]
Fixed a crash in the notification group manager
When 2 notifications were posted as the summary of the same
group, then the system would eventually crash.
Bug:
23676310
Change-Id: Ia8f95e624f3f43d1b55169dd8102e3c89427dc76