OSDN Git Service

android-x86/frameworks-base.git
8 years agoam cd946024: Default grant SMS and Phone to the verifier
Svet Ganov [Tue, 15 Sep 2015 20:10:30 +0000 (20:10 +0000)]
am cd946024: Default grant SMS and Phone to the verifier

* commit 'cd946024e94a8fe2f4009dbd2e5463817a17b3a9':
  Default grant SMS and Phone to the verifier

8 years agoMerge "NetworkDiagnostics: ping default router from all global addreses." into mnc...
Lorenzo Colitti [Tue, 15 Sep 2015 02:39:20 +0000 (02:39 +0000)]
Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev

8 years agoMerge "Fix light status bar transitions" into mnc-dr-dev
Adrian Roos [Mon, 14 Sep 2015 18:47:59 +0000 (18:47 +0000)]
Merge "Fix light status bar transitions" into mnc-dr-dev

8 years agoMerge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
Chris Manton [Mon, 14 Sep 2015 17:23:42 +0000 (17:23 +0000)]
Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev

8 years agoDefault grant SMS and Phone to the verifier
Svet Ganov [Sat, 12 Sep 2015 17:19:54 +0000 (10:19 -0700)]
Default grant SMS and Phone to the verifier

bug:24012164

Change-Id: I756644c8044076b2550d7ca104f542f50da0226b

8 years agoDump Keyguard state in SystemUI and PhoneWindowManager
Jorim Jaggi [Sat, 12 Sep 2015 00:45:22 +0000 (17:45 -0700)]
Dump Keyguard state in SystemUI and PhoneWindowManager

Bug: 23970549
Change-Id: Iec1e8ac507268086e0e2935847eda606ea1fb700

8 years agoFix light status bar transitions
Adrian Roos [Fri, 11 Sep 2015 19:38:43 +0000 (12:38 -0700)]
Fix light status bar transitions

Bug: 23971926
Change-Id: Ia3c6fb18d38fb7479028191ad3df8389adb830ec

8 years agoAdd capability to ignore carrier entitlement checks
Chris Manton [Tue, 1 Sep 2015 20:56:46 +0000 (13:56 -0700)]
Add capability to ignore carrier entitlement checks

Boolean to check to ignore carrier entitlement check.
API to follow later.

Carrier configuration manager has an option
to override tethering entitlement checks.
Ignore entitlement checks if overridden by
the carrier configuration flag.

bug:23712807

Change-Id: I6c9b3b9994279e592db304debef54809338fe9cf

8 years agoMerge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
Alan Viverette [Fri, 11 Sep 2015 21:28:59 +0000 (21:28 +0000)]
Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev

8 years agoMerge "Add carrier config for characters to escape with backslash." into mnc-dr-dev
Tyler Gunn [Fri, 11 Sep 2015 15:37:40 +0000 (15:37 +0000)]
Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev

8 years agoMerge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
Roshan Pius [Fri, 11 Sep 2015 06:13:12 +0000 (06:13 +0000)]
Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev

8 years agoListen for fingerprint when on bouncer
Jorim Jaggi [Thu, 10 Sep 2015 21:36:19 +0000 (14:36 -0700)]
Listen for fingerprint when on bouncer

To make unlocking work if keyguard is in occluded state and user
taps on a notification.

Bug: 22855718
Change-Id: Ide632f524a635e3e37741abaa77e258394c9a6e2

8 years agoDon't wait for brightness changes
Jorim Jaggi [Mon, 24 Aug 2015 20:54:19 +0000 (13:54 -0700)]
Don't wait for brightness changes

On some devices, changing the brightness is quite slow, because the
change needs to wait for the vsync signal. However, when we are also
running a brightness change animation, as soon as the last change has
been sent there is a new one pending, leading to that we never reach
"clean" state in the PowerManagerService and thus we don't notify
clients about the state change, which can delay the animation for waking
up while dozing by as much as a second.

To fix this, if we only issue a brightness change, we don't block on
that because it's not relevant for us.

Bug: 22879546
Change-Id: Idad7e90c436bfbc38581fe8ce24d606e432b7952

8 years agoam 5579e41c: Add op package to the UID special case handling in account manager.
Svetoslav [Fri, 11 Sep 2015 00:23:08 +0000 (00:23 +0000)]
am 5579e41c: Add op package to the UID special case handling in account manager.

* commit '5579e41c6f81bba1fc1e8cc53186957e287b5dad':
  Add op package to the UID special case handling in account manager.

8 years agoMerge "Add to configure for MDC_INITIAL_MAX_RETRY" into mnc-dr-dev
Amit Mahajan [Thu, 10 Sep 2015 23:22:37 +0000 (23:22 +0000)]
Merge "Add to configure for MDC_INITIAL_MAX_RETRY" into mnc-dr-dev

8 years agoAdd to configure for MDC_INITIAL_MAX_RETRY
Sungmin Choi [Thu, 10 Sep 2015 18:25:02 +0000 (11:25 -0700)]
Add to configure for MDC_INITIAL_MAX_RETRY

Bug: 23804201
Change-Id: I63fbc168c05792635b7919e81d7397741ffb416b

8 years agoAdd op package to the UID special case handling in account manager.
Svetoslav [Thu, 10 Sep 2015 22:30:45 +0000 (15:30 -0700)]
Add op package to the UID special case handling in account manager.

The account manager has a hardcoded rule to change the calling
UID if the caller is the system and another UID is passed in.
We have to do the same acrobatics for the app op package as if
the UID changes the opPackageName will not match the new UID.
If we used the passed in UID we should also use the passed in
op package name.

bug:23968092

Change-Id: I0c0c2a720e9edbf82001952929d990702f8650ca

8 years agoMerge "Fix missing copyright headers." into mnc-dr-dev
Martijn Coenen [Thu, 10 Sep 2015 21:17:56 +0000 (21:17 +0000)]
Merge "Fix missing copyright headers." into mnc-dr-dev

8 years agoAdd carrier config for characters to escape with backslash.
Tyler Gunn [Thu, 10 Sep 2015 20:33:28 +0000 (13:33 -0700)]
Add carrier config for characters to escape with backslash.

Bug: 22779583
Change-Id: I21ab2c9a4f15bcf96c5b978e7cac4638db259087

8 years agoAdd a new carrier config for DTMF tone gap.
Roshan Pius [Thu, 10 Sep 2015 17:28:06 +0000 (10:28 -0700)]
Add a new carrier config for DTMF tone gap.

Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network.
This is the same fix as ag/747865 ported for GSM connections.

BUG: 23064351
Change-Id: I4163323378e380ac187493fa91694721269124b9

8 years agoAvoid OOBE when AbsListView layout is out of sync with adapter
Alan Viverette [Thu, 10 Sep 2015 15:10:41 +0000 (11:10 -0400)]
Avoid OOBE when AbsListView layout is out of sync with adapter

Views are not synchronized with adapter state until a layout pass
occurs, which may cause an OOBE if a list item is removed and an
accessibility node is obtained before the next layout pass.

This CL caches the item's enabled state on the bound view's layout
params, which allows us to avoid relying on the adapter to populate
accessibility nodes. It also aborts actions if the target position
is no longer valid.

Updates the documentation on AdapterView to reflect that the result
of getPositionForView() may not be synchronized with the adapter.

Bug: 23943664
Change-Id: I90ca946bead1d87a179eab1c2f482a54bcce9c38

8 years agoNetworkDiagnostics: ping default router from all global addreses.
Lorenzo Colitti [Wed, 9 Sep 2015 08:37:12 +0000 (17:37 +0900)]
NetworkDiagnostics: ping default router from all global addreses.

This will hopefully allow us to determine if the router does not
have our global addresses in its neighbour cache.

Bug: 23661687
Change-Id: I46734c3c719003939cfccf038457ec309a9ff967

8 years agoMerge "Add carrier config variable to hide preferred network type" into mnc-dr-dev
Amit Mahajan [Thu, 10 Sep 2015 00:55:15 +0000 (00:55 +0000)]
Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev

8 years agoMerge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev
Daniel Sandler [Thu, 10 Sep 2015 00:53:14 +0000 (00:53 +0000)]
Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev

8 years agoAdd carrier config variable to hide preferred network type
Sungmin Choi [Tue, 8 Sep 2015 22:34:23 +0000 (15:34 -0700)]
Add carrier config variable to hide preferred network type

Bug: 23862319
Change-Id: I99403f358f0b53f366083edafc3762f5679b0b45

8 years agoMerge "Add double-tap power button to open camera 1/2" into mnc-dr-dev
Jorim Jaggi [Thu, 10 Sep 2015 00:25:59 +0000 (00:25 +0000)]
Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev

8 years agoMerge "Special interval value to always run benchmarks." into mnc-dr-dev
Jeff Sharkey [Thu, 10 Sep 2015 00:18:43 +0000 (00:18 +0000)]
Merge "Special interval value to always run benchmarks." into mnc-dr-dev

8 years agoRevert "Disable fingerprint after force lock"
Jorim Jaggi [Wed, 9 Sep 2015 23:29:17 +0000 (23:29 +0000)]
Revert "Disable fingerprint after force lock"

Bug: 23827042
This reverts commit 0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7.

Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923

8 years agoAdd double-tap power button to open camera 1/2
Adrian Roos [Thu, 3 Sep 2015 22:59:49 +0000 (15:59 -0700)]
Add double-tap power button to open camera 1/2

Bug: 23787555
Change-Id: I052b64748f155c59fbb649b32265f559423a8845

8 years agoSpecial interval value to always run benchmarks.
Jeff Sharkey [Wed, 9 Sep 2015 21:53:38 +0000 (14:53 -0700)]
Special interval value to always run benchmarks.

When interval is set of 0, always run benchmarks after every fstrim
pass, which is roughly daily.  We don't actually track the last
benchmark time for internal storage, so this is the best way we have
to enable this.

Also disable benchmarking completely when interval is set to -1.

Bug: 23942769
Change-Id: I11edfda063aac6e927c6cce56567169ebe83cb71

8 years agoMerge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev
Selim Cinek [Wed, 9 Sep 2015 22:07:02 +0000 (22:07 +0000)]
Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev

8 years agoUse AlarmManager for lockout reset
Jorim Jaggi [Fri, 4 Sep 2015 21:17:58 +0000 (14:17 -0700)]
Use AlarmManager for lockout reset

So the lockout reset exactly fires after 30 seconds, independent
of whether the device was in deep sleep.

Bug: 23668918
Change-Id: Idea1a877c395897c1fd075cf98edf41c8b1f4082

8 years agoMerge "Add carrier config variable to hide ims apn" into mnc-dr-dev
Vineeta Srivastava [Wed, 9 Sep 2015 17:12:39 +0000 (17:12 +0000)]
Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev

8 years agoMerge "Add carrier config for specifying invalid characters." into mnc-dr-dev
Tyler Gunn [Wed, 9 Sep 2015 16:09:33 +0000 (16:09 +0000)]
Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev

8 years agoam 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
Svetoslav Ganov [Wed, 9 Sep 2015 01:42:56 +0000 (01:42 +0000)]
am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev

* commit '4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d':
  Add get_accounts app op

8 years agoMerge "Add get_accounts app op" into mnc-dev
Svetoslav Ganov [Wed, 9 Sep 2015 01:36:58 +0000 (01:36 +0000)]
Merge "Add get_accounts app op" into mnc-dev

8 years agoFixed a racecondition where the camera would not launch
Selim Cinek [Thu, 3 Sep 2015 23:01:53 +0000 (16:01 -0700)]
Fixed a racecondition where the camera would not launch

If the gesture was detected while turning on, the gesture
would not launch.

Bug: 23636271
Change-Id: I166759a55137163be0c3f38fe8d1dc0c18977e11

8 years agoAdd get_accounts app op
Svetoslav [Tue, 8 Sep 2015 21:36:35 +0000 (14:36 -0700)]
Add get_accounts app op

For each runtime permission we have an app op to toggle the
permission for legacy apps as they cannot handle permission
revocations. We were lacking an app op for get_accounts
which prevented the user from controlling access to accounts
regardelss that they change the state of the permission
toggle in the UI. Even worse the permission UI is written
with the assumption that every runtime permission has an
app op and as a result revoking the contacts group (if the
app requests the get_accounts permission) is reset back to
allowed in the UI.

bug:23854618

Change-Id: I9e3f9bfeb320bed561d718db99ee285915d5701b

8 years agoMerge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
Zhentao Sun [Wed, 9 Sep 2015 00:29:03 +0000 (00:29 +0000)]
Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev

8 years agoAdd carrier config variable to hide ims apn
Sungmin Choi [Mon, 31 Aug 2015 22:32:20 +0000 (15:32 -0700)]
Add carrier config variable to hide ims apn

Bug: 23770219
Change-Id: I691d2594384196852d7128a9b4969ba9a861205c

8 years agoMerge changes from topic 'packet-keepalive-fixes' into mnc-dr-dev
Lorenzo Colitti [Wed, 9 Sep 2015 00:18:39 +0000 (00:18 +0000)]
Merge changes from topic 'packet-keepalive-fixes' into mnc-dr-dev

* changes:
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.

8 years agoCancel animation when hiding Keyguard
Jorim Jaggi [Fri, 4 Sep 2015 02:58:19 +0000 (19:58 -0700)]
Cancel animation when hiding Keyguard

So we don't end up in a wrong state.

Bug: 23692022
Change-Id: If40eb66499c95b82d86873dbbd6ccc64468373b2

8 years agoRemoved the secure camera launcher
Selim Cinek [Wed, 2 Sep 2015 01:05:08 +0000 (18:05 -0700)]
Removed the secure camera launcher

With Android M, the system correctly handles camera arbitration
and therefore the secure camera launcher was only adding delay.

Bug: 23713450
Change-Id: Icd5e7883f3560bfd0c9b5f7bd93675847949469b

8 years agoChanged the vibration duration from 1s to 750ms.
Zhentao Sun [Tue, 8 Sep 2015 22:41:25 +0000 (15:41 -0700)]
Changed the vibration duration from 1s to 750ms.

Fixed b/23727634.

Change-Id: Ie03b26f7b8faee8d61d772041351729995f7088c

8 years agoam 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-andro...
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

8 years agoam 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesso...
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

8 years agoam 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesour...
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

8 years agoam 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove...
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

8 years agoMerge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct...
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

8 years agodocs: change intro and title for contacts and sign-in lesson, and remove empty bullet
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

8 years agoam 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson...
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

8 years agoMerge "docs: change intro and title for contacts and sign-in lesson, and remove empty...
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

8 years agoMerge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
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

8 years agoDo 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

8 years agodocs: change intro and title for contacts and sign-in lesson, and remove empty bullet
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

8 years agoRequire the new PACKET_KEEPALIVE_OFFLOAD permission.
Lorenzo Colitti [Tue, 8 Sep 2015 13:02:37 +0000 (22:02 +0900)]
Require the new PACKET_KEEPALIVE_OFFLOAD permission.

Bug: 23884210
Change-Id: I50a1a647a69deaba92e73021ee7d6cc0f3eb1eee

8 years agoAdd an error code for generic hardware error.
Lorenzo Colitti [Tue, 8 Sep 2015 07:46:36 +0000 (16:46 +0900)]
Add an error code for generic hardware error.

This is necessary because currently the wifi code just returns
whatever hardware-specific integer it gets back from the HAL,
which is bad because that will be interpreted by the caller as
one of the error codes defined in this class.

In parallel we'll also modify the wifi code to return this new
error code if the hardware returns an error.

Bug: 21405946
Change-Id: Ic9fa1193ced69a4e7ff543e397221c89b10a5a13

8 years agoFix bugs and crashes in PacketKeepalive API.
Lorenzo Colitti [Tue, 8 Sep 2015 04:44:23 +0000 (13:44 +0900)]
Fix bugs and crashes in PacketKeepalive API.

Bug: 22606153
Bug: 23820819
Bug: 23884210
Change-Id: I1bf82094ec664baed345e9fb137fada0cbf4b7a0

8 years agoAdd tests for the PacketKeepalive API.
Lorenzo Colitti [Tue, 8 Sep 2015 04:21:48 +0000 (13:21 +0900)]
Add tests for the PacketKeepalive API.

This currently fails in many different ways, but it tells us what
to fix.

Bug: 22606153
Bug: 23884210
Change-Id: If2e5ee0a8d7b26cad67d3d566ed5b1383e0db096

8 years agoAdd a PACKET_KEEPALIVE_OFFLOAD permission.
Lorenzo Colitti [Tue, 8 Sep 2015 04:23:00 +0000 (13:23 +0900)]
Add a PACKET_KEEPALIVE_OFFLOAD permission.

Bug: 23884210
Change-Id: I0f9207ac9b9c07c676f64f2748905e523e891501

8 years agoUse a CountDownLatch instead of sleep() in NetworkFactory tests.
Lorenzo Colitti [Fri, 7 Aug 2015 16:55:44 +0000 (01:55 +0900)]
Use a CountDownLatch instead of sleep() in NetworkFactory tests.

This makes testNetworkFactoryRequests 2-3 times faster.

Bug: 22606153
Change-Id: I9657b6929e77f23ec811d0ab57b2ba974f0b6a69

8 years agoGet rid of shortSleep() in ConnectivityServiceTest.
Lorenzo Colitti [Fri, 7 Aug 2015 11:17:27 +0000 (20:17 +0900)]
Get rid of shortSleep() in ConnectivityServiceTest.

Instead, use IdleHandler to wait for things to become idle.

Bug: 22606153
Change-Id: Ic6ab93ad4d336b40962f9be1096629a44b63ee2f

8 years agoImport 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

8 years agoMake ConnectivityServiceTest a bit more readable.
Lorenzo Colitti [Fri, 7 Aug 2015 03:49:01 +0000 (12:49 +0900)]
Make ConnectivityServiceTest a bit more readable.

1. Make TestNetworkCallback a bit smarter and rename it to
   SingleUseNetworkCallback. This allows us to get rid of all the
   calls to TestNetworkCallback#getConditionVariable.
2. Delete the commented out code that used to test a
   ConnectivityService model that has not been used since KK.
3. Remove unused imports, etc.

Bug: 22606153
Change-Id: I81a2d0b970d19e5f4515490d8c2f88d416445fa1

8 years agoFix missing copyright headers.
Martijn Coenen [Mon, 7 Sep 2015 09:53:59 +0000 (11:53 +0200)]
Fix missing copyright headers.

Bug: 23868522
Change-Id: I37fb86e3a751fad363d70687d1b9bcd512bcd33e

8 years agoam 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google...
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

8 years agoam 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.
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.

8 years agoam 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Googl...
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

8 years agoam a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.
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.

8 years agoam 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in...
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

8 years agoam 81e0dff0: Minor fix on Auto Desktop Head Unit doc.
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.

8 years agoMerge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-previe...
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

8 years agoIntroduce config_wifi_revert_country_code_on_cellular_loss
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

8 years agoMerge "Cut down some logs." into mnc-dr-dev
Robert Greenwalt [Fri, 4 Sep 2015 21:51:50 +0000 (21:51 +0000)]
Merge "Cut down some logs." into mnc-dr-dev

8 years agoAdd carrier config for specifying invalid characters.
Tyler Gunn [Fri, 4 Sep 2015 20:16:37 +0000 (13:16 -0700)]
Add carrier config for specifying invalid characters.

Some carriers have the need to strip out certain invalid characters in
instant lettering (e.g. call subject) messages.
This carrier config is added for that purpose.

Bug: 22779583
Change-Id: I165dc125e6d40a0a85442ff138a77d286eb83a4c

8 years agoMerge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc...
Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:09:02 +0000 (16:09 +0000)]
Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev

8 years agoDo not show roaming icon for some operators of Chile
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

8 years agoCut down some logs.
Robert Greenwalt [Thu, 3 Sep 2015 23:41:45 +0000 (16:41 -0700)]
Cut down some logs.

bug:23623327
Change-Id: I737d4e6c384bf4da62c65ad2abe0c9b5dca0067a

8 years agoMerge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
Andre Eisenbach [Fri, 4 Sep 2015 00:02:57 +0000 (00:02 +0000)]
Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev

8 years agoBluetooth: Fix profile auto-connect logic
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

8 years agoMerge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
Dan Stoza [Thu, 3 Sep 2015 21:55:36 +0000 (21:55 +0000)]
Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev

8 years agoMerge changes from topic 'TDSCDMA support' into mnc-dr-dev
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

8 years agoSurfaceControl: Add colorTransform to DisplayInfo
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

8 years agoMerge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev
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

8 years agoMerge "Poke fingerprint timeout when vold password is correct" 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

8 years agoDon't disable fingerprint when entering wrong credential
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

8 years agoPoke fingerprint timeout when vold password is correct
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

8 years agoMerge "Show face unlock even when fingerprint is running" into mnc-dr-dev
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

8 years agoam 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into...
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.

8 years agoMerge "Don't crash on (invalid) hardware address lengths > 127." into mnc-dev
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

8 years agoam 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update."...
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.

8 years agoam 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service...
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.

8 years agoMerge "Don't drop runtime permissions on older system app update." into mnc-dev
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

8 years agoMerge "Respect DONT_KILL_APP flag when bringing down a disabled service." 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

8 years agoMake the vertical navbar 48dp like the horizontal one.
Dan Sandler [Thu, 3 Sep 2015 14:51:57 +0000 (10:51 -0400)]
Make the vertical navbar 48dp like the horizontal one.

When the navigation bar was originally introduced to phones
(in change Ic613a335) we wanted it to stick to the same spot
on the display so that it felt as much as possible like a
physical button array; pressing the same fingertip-sized
spot on the glass should always invoke BACK, etc. This meant
flipping the nav bar to a vertical orientation when the
phone was in landscape, and then juggling around the window
insets and other system windows to make room for it.

For reasons that are now lost to time, in that original
implementation we made the vertical navigation bar narrower:
42dp (versus 48dp for the horizontal navigation bar, which
incidentally is always horizontal on tablet-type devices).
Nobody really noticed (except app developers looking to
hardcode this value instead of just using fitSystemWindows
or the new WindowInsets).

Here we finally make the navigation bars match perfectly in
portrait and landscape.

Bug: 23724209
Change-Id: I861be84b41c6a227d269469686c8c66a32029f1d

8 years agoMerge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
Michael Wright [Thu, 3 Sep 2015 14:00:52 +0000 (14:00 +0000)]
Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev

8 years agoDon't crash on (invalid) hardware address lengths > 127.
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

8 years agoShow face unlock even when fingerprint is running
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

8 years agoMerge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev
Jim Miller [Wed, 2 Sep 2015 23:07:58 +0000 (23:07 +0000)]
Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev

8 years agoFingerprint should throttle after 5 attempts
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