OSDN Git Service
Jim Miller [Tue, 15 Sep 2015 21:23:01 +0000 (21:23 +0000)]
am
dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
* commit '
dca3b2f74f7979e87e2654baf83df42483ef4388':
Add logging to track fingerprint reco but not unlocking
Guang Zhu [Tue, 15 Sep 2015 21:22:55 +0000 (21:22 +0000)]
am
fe74fb95: extend svc command to control NFC state
* commit '
fe74fb95b91a5d58a8d2d238c525e2f1891ca0c7':
extend svc command to control NFC state
Svet Ganov [Tue, 15 Sep 2015 21:22:50 +0000 (21:22 +0000)]
am
276da47a: am
cd946024: Default grant SMS and Phone to the verifier
* commit '
276da47adf23b5512985268f36fab0b7d2d11363':
Default grant SMS and Phone to the verifier
Jim Miller [Tue, 15 Sep 2015 21:08:06 +0000 (21:08 +0000)]
Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
Guang Zhu [Mon, 14 Sep 2015 01:43:56 +0000 (18:43 -0700)]
extend svc command to control NFC state
Change-Id: I599e4000fa17384089410e63b3150f25aa9458f7
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
Lorenzo Colitti [Tue, 15 Sep 2015 02:46:51 +0000 (02:46 +0000)]
am
e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
* commit '
e1e97377d04ab6e5d069c85aba4226f47371e7c6':
NetworkDiagnostics: ping default router from all global addreses.
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
Jim Miller [Tue, 15 Sep 2015 01:58:08 +0000 (18:58 -0700)]
Add logging to track fingerprint reco but not unlocking
Bug
23940153
Change-Id: Idb01802ba68449370e8f3cbede0e2fe6d0b977ce
Adrian Roos [Mon, 14 Sep 2015 18:54:42 +0000 (18:54 +0000)]
am
6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev
* commit '
6b04e3a6ea042be0e012f7501fadb461b3d772a7':
Fix light status bar transitions
Adrian Roos [Mon, 14 Sep 2015 18:47:59 +0000 (18:47 +0000)]
Merge "Fix light status bar transitions" into mnc-dr-dev
Chris Manton [Mon, 14 Sep 2015 17:29:17 +0000 (17:29 +0000)]
am
c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
* commit '
c9180528452d67359618eda4aa2edd39112c83ca':
Add capability to ignore carrier entitlement checks
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
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
Jorim Jaggi [Sat, 12 Sep 2015 01:31:39 +0000 (01:31 +0000)]
am
84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager
* commit '
84dc08a208eea7a4ddf043cadbb28987cf90ae22':
Dump 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
Adrian Roos [Fri, 11 Sep 2015 19:38:43 +0000 (12:38 -0700)]
Fix light status bar transitions
Bug:
23971926
Change-Id: Ia3c6fb18d38fb7479028191ad3df8389adb830ec
Alan Viverette [Fri, 11 Sep 2015 21:36:56 +0000 (21:36 +0000)]
am
62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
* commit '
62b94c353a8748ef10691da4844bf894e1155870':
Avoid OOBE when AbsListView layout is out of sync with adapter
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
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
Tyler Gunn [Fri, 11 Sep 2015 15:43:21 +0000 (15:43 +0000)]
am
8ed28188: Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev
* commit '
8ed28188b95be4f377909ac2abacaef76e004a61':
Add carrier config for characters to escape with backslash.
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
Roshan Pius [Fri, 11 Sep 2015 06:18:52 +0000 (06:18 +0000)]
am
0a067dc7: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
* commit '
0a067dc711b19a70ad5980fa360b2df2337a55b1':
Add a new carrier config for DTMF tone gap.
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
Jorim Jaggi [Fri, 11 Sep 2015 05:05:58 +0000 (05:05 +0000)]
am
3cf7eef1: Listen for fingerprint when on bouncer
* commit '
3cf7eef1b1890131902447465a343484e23e2115':
Listen for fingerprint when on bouncer
Jorim Jaggi [Fri, 11 Sep 2015 05:05:51 +0000 (05:05 +0000)]
am
6e90ea03: Don\'t wait for brightness changes
* commit '
6e90ea03365c6baddc13762c5a701b84540d8bf9':
Don't wait for brightness changes
Svetoslav [Fri, 11 Sep 2015 05:05:11 +0000 (05:05 +0000)]
am
b1cebd9e: am
5579e41c: Add op package to the UID special case handling in account manager.
* commit '
b1cebd9ecf2ee3542e815f7f7efc1cb7fd6e6228':
Add op package to the UID special case handling in account manager.
Amit Mahajan [Fri, 11 Sep 2015 05:04:58 +0000 (05:04 +0000)]
am
55c3a196: Merge "Add to configure for MDC_INITIAL_MAX_RETRY" into mnc-dr-dev
* commit '
55c3a196feaf089b70fcad48253dfa7ae89acab3':
Add to configure for MDC_INITIAL_MAX_RETRY
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
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
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.
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
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
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
Martijn Coenen [Thu, 10 Sep 2015 21:24:36 +0000 (21:24 +0000)]
am
e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev
* commit '
e1d2d42289afe6e6a65d2ef420b8bf8ed2b33d3b':
Fix missing copyright headers.
Martijn Coenen [Thu, 10 Sep 2015 21:17:56 +0000 (21:17 +0000)]
Merge "Fix missing copyright headers." into mnc-dr-dev
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
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
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
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
Amit Mahajan [Thu, 10 Sep 2015 01:00:59 +0000 (01:00 +0000)]
am
0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev
* commit '
0018323c07d119fde7260d66f60dd9987c7b74ea':
Add carrier config variable to hide preferred network type
Daniel Sandler [Thu, 10 Sep 2015 01:00:50 +0000 (01:00 +0000)]
am
5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev
* commit '
5b40e2253e82d46838c88e6c52dee276a781d593':
Make the vertical navbar 48dp like the horizontal one.
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
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
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
Jorim Jaggi [Thu, 10 Sep 2015 00:36:31 +0000 (00:36 +0000)]
am
5d0e02b6: Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev
* commit '
5d0e02b64e5b860e989268d1e7fd882e5fd47919':
Add double-tap power button to open camera 1/2
Jeff Sharkey [Thu, 10 Sep 2015 00:26:48 +0000 (00:26 +0000)]
am
2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev
* commit '
2ebbf4c899b39e080be1ec9cd5d1178f30c0cd89':
Special interval value to always run benchmarks.
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
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
Jorim Jaggi [Thu, 10 Sep 2015 00:05:42 +0000 (00:05 +0000)]
am
16093fe3: Revert "Disable fingerprint after force lock"
* commit '
16093fe3f0d824731a53a264a132504deb08421a':
Revert "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
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
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
Selim Cinek [Wed, 9 Sep 2015 22:16:11 +0000 (22:16 +0000)]
am
a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev
* commit '
a4fca2c7255367b96fc8012b0fcb62a71343e1ff':
Fixed a racecondition where the camera would not launch
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
Jorim Jaggi [Wed, 9 Sep 2015 20:54:12 +0000 (20:54 +0000)]
am
5e354223: Use AlarmManager for lockout reset
* commit '
5e354223d817477efac9a6a2e3ce3d9161e046a4':
Use 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
Vineeta Srivastava [Wed, 9 Sep 2015 17:22:46 +0000 (17:22 +0000)]
am
ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit '
ebd1465885af2a1de5a885dac791ee6184f85d7f':
Add carrier config variable to hide ims apn
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
Tyler Gunn [Wed, 9 Sep 2015 16:16:07 +0000 (16:16 +0000)]
am
dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
* commit '
dee1c5c948a5e1b98577a3301882aac04154b5be':
Add carrier config for specifying invalid characters.
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
Svetoslav Ganov [Wed, 9 Sep 2015 01:51:45 +0000 (01:51 +0000)]
am
f57d9856: am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
f57d98564b26953b722ab0e14222f50e6515f36d':
Add get_accounts app op
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
Svetoslav Ganov [Wed, 9 Sep 2015 01:36:58 +0000 (01:36 +0000)]
Merge "Add get_accounts app op" into mnc-dev
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
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
Zhentao Sun [Wed, 9 Sep 2015 00:38:53 +0000 (00:38 +0000)]
am
5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
* commit '
5536d4477572e437c95111630d5c2723350d99a5':
Changed the vibration duration from 1s to 750ms.
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
Lorenzo Colitti [Wed, 9 Sep 2015 00:26:59 +0000 (00:26 +0000)]
am
017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '
017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
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.
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
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.
Jorim Jaggi [Wed, 9 Sep 2015 00:12:45 +0000 (00:12 +0000)]
am
52429b4a: Cancel animation when hiding Keyguard
* commit '
52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f':
Cancel 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
Selim Cinek [Tue, 8 Sep 2015 23:59:06 +0000 (23:59 +0000)]
am
edf47486: Removed the secure camera launcher
* commit '
edf47486507f5edad1d1d8e6091b9a82f9e56930':
Removed 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
Tyler Gunn [Tue, 8 Sep 2015 23:03:58 +0000 (23:03 +0000)]
Merge "IMS: Capabilities propagation" into mnc-vt-dev
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
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
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
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
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
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
Lorenzo Colitti [Tue, 8 Sep 2015 04:23:00 +0000 (13:23 +0900)]
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Bug:
23884210
Change-Id: I0f9207ac9b9c07c676f64f2748905e523e891501
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
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
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