Commit Graph

47431 Commits

Author SHA1 Message Date
Robin Lee
4ee45178c8 am dbb03371: am 6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev
* commit 'dbb03371cea085f06de3e9cfb255efaad9a97d4e':
  Device policy: use owner label instead of name
2015-05-01 13:20:13 +00:00
Robin Lee
6e761c5d6b Merge "Device policy: use owner label instead of name" into mnc-dev 2015-05-01 12:57:37 +00:00
Narayan Kamath
c2b1f93c70 am 2d7d9523: am a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M
* commit '2d7d952323a11e0fcf8b2d435ba857d45af05503':
  AlarmManager: Reject non-olson timezones for targetSdk >= M
2015-05-01 11:15:54 +00:00
Narayan Kamath
a78240ba5f AlarmManager: Reject non-olson timezones for targetSdk >= M
This has caused a lot of grief, confusion and outright broken
behaviour due to the fact that the Posix spec and the Java spec
define conflicting interpretations of "custom" timezones like
GMT+5:30 (eastern hemisphere for java, western for posix).

bug: 19987403
bug: 19106773
Change-Id: Ia9b007067bb175b0805d4262f17390a0bd98d927
2015-05-01 09:39:25 +00:00
Wei Wang
17004d6367 am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev
* commit '342c22a5973386d5a5fdb0b552a26f51920cb026':
  Fix a bug in ScanSettings constructor.
2015-05-01 08:48:14 +00:00
Wei Wang
f2cfe6c0a9 Merge "Fix a bug in ScanSettings constructor." into mnc-dev 2015-05-01 07:51:40 +00:00
Wei Wang
c5065ee98d Fix a bug in ScanSettings constructor.
Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71
2015-05-01 00:50:32 -07:00
Wei Wang
c869bbfd94 am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev
* commit '50b37f8c6a7237af29f533b83ee2176301d107ea':
  Honor Ble scanning settings from Settings UI.
2015-05-01 05:30:36 +00:00
Wei Wang
c90c760431 Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 2015-05-01 05:10:18 +00:00
Lorenzo Colitti
ad44d81457 am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* commit '3dc082200a1f425ab579e2082c0d70eefa399b8b':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
2015-05-01 04:04:03 +00:00
Lorenzo Colitti
b57f236e30 Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* changes:
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
2015-05-01 03:45:14 +00:00
Lorenzo Colitti
f7058f5d1d Add a hidden method to clear NetworkCapabilities.
Change-Id: Icf7d67e24a09113340e9bff2c72526760914ef48
2015-05-01 12:36:29 +09:00
Lorenzo Colitti
2ea89e59c3 Fix javadoc error for requestNetwork.
The ConnectivityManager documentation uses {@link requestNetwork}
without specifying which version of that method it refers to.
This results in javadoc incorrectly linking to the version of the
method that takes a PendingIntent instead of the version that
takes a callback.

Change-Id: Ia914ec88005a6401b6391c5b4fc92f988baa3922
2015-05-01 12:36:29 +09:00
Lorenzo Colitti
db95a60981 Simplify network callback handling code.
Change-Id: I2490ad754bf2a1282f27302c8556fb19983cc6b1
2015-05-01 12:36:28 +09:00
Lorenzo Colitti
0708693f1e Document and unhide CALLBACK_PRECHECK.
Bug: 20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f
2015-05-01 12:36:28 +09:00
tturney
129a0b8bf9 am 94d7494a: am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-dev
* commit '94d7494a2b98b723710eee9d3398e99e64b7688b':
  Fix typo. bug: b/20610710
2015-05-01 00:50:00 +00:00
tturney
56c58a2e27 Merge "Fix typo. bug: b/20610710" into mnc-dev 2015-05-01 00:17:41 +00:00
Wei Wang
67d8416b8e Honor Ble scanning settings from Settings UI.
Bug:20643039

Change-Id: Ib1465108e26b8537c9da1bfbb31a99d2e33da910
2015-04-30 14:45:17 -07:00
Alan Viverette
4cff05e1f7 am 87706358: am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
* commit '877063589ac8b5d9e8151df9b8553ddd3adb752b':
  LayoutInflater should always try to generate LayoutParams for include
2015-04-30 21:21:01 +00:00
Alex Klyubin
c89e1a96c5 am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
* commit 'c8b068ce477b3520a1ab20b7f29455d630724c38':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
2015-04-30 21:20:56 +00:00
Alex Klyubin
c9122d6fe2 am 07a2ebd3: am 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev
* commit '07a2ebd39d4c77c2dbd3c6e2bddecf76894f9fba':
  Fix thread affinity of FingerprintManager.
2015-04-30 21:20:47 +00:00
Todd Kennedy
9c14b3ab0d am c7e9a17a: am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev
* commit 'c7e9a17a626cc07eb9e4cb4b897dad50d3fb68a8':
  Remove dependency upon FragmentActivity
2015-04-30 21:10:06 +00:00
Alan Viverette
ac7927a895 Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 2015-04-30 21:03:23 +00:00
Alex Klyubin
cf2999aacf Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev 2015-04-30 21:01:00 +00:00
Alex Klyubin
6358b881f2 Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
This converts KM_ERROR_CALLER_NONCE_PROHIBITED into
InvalidAlgorithmParameterSpec, as expected by the contract of JCA
Cipher.

Bug: 18088752
Change-Id: I6a01e2d7118c478b27a0d7a5a14a127de8913755
2015-04-30 13:57:44 -07:00
Alex Klyubin
0069301d36 Merge "Fix thread affinity of FingerprintManager." into mnc-dev 2015-04-30 20:56:24 +00:00
Mady Mellor
04f2fe3958 am d73f05f5: am 2619ef39: Merge "Add onStylusButtonPress listener to View" into mnc-dev
* commit 'd73f05f5f0ec3a212e4390d790c0229892c21930':
  Add onStylusButtonPress listener to View
2015-04-30 20:36:06 +00:00
Alex Klyubin
24e9e966a8 Fix thread affinity of FingerprintManager.
FingerprintManager internally creates a Handler which needs to be
bound to a Looper thread. Prior to this CL the Handler was bound to
the Looper of the current thread. This caused issues:
* Different instances of FingerprintManager could be bound to
  different Looper threads.
* Callbacks from FingerprintManager were invoked on arbitrary
  threads (or not at all if the Looper was there but wasn't running).
* FingerprintManager couldn't be obtained by apps on most non-main
  threads leading to java.lang.RuntimeException: Can't create handler
  inside thread that has not called Looper.prepare().

This CL fixes the issue by binding the FingerprintManager's Handler to
the Looper running on the main thread.

Bug: 20725228
Change-Id: I4a0382d6e11df9f23b8db9f0deec77369af31b5e
2015-04-30 13:34:58 -07:00
Todd Kennedy
a5fc6f006f Remove dependency upon FragmentActivity
The FragmentManagerImpl is intimately tied with a FragmentActivity. In
many cases, we want to be able to create / manage Fragments outside of
a FragmentManager. This defines a FragmentController interface that can
be used by any class to host Fragments.

Bug: 19569654
Change-Id: I6816a5c1815122d206062b9f4584ad460b3d41dd
2015-04-30 12:52:32 -07:00
Alan Viverette
84aa2fb65a LayoutInflater should always try to generate LayoutParams for include
A recent optimization assumed that layout_width and layout_height always
had to be defined to successfully generate layout params, but this is not
guaranteed to be true for custom ViewGroups.

Bug: 20267738
Change-Id: If09d346f30c0848b984b9137088f8f3b7617cd08
2015-04-30 12:33:54 -07:00
Mady Mellor
2619ef3918 Merge "Add onStylusButtonPress listener to View" into mnc-dev 2015-04-30 19:06:45 +00:00
Eino-Ville Talvala
6b2ccdc26b am 6dee203a: am 6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev
* commit '6dee203aee673eea91633d8557a4aa1ff21296cb':
  Camera2: LEGACY: Support prepare(), sort of.
2015-04-30 18:39:38 +00:00
Svetoslav
cae8686c88 am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev
* commit '0165cf4d719ab6560507a18ffd7375b0ad850622':
  Add use fingerprint app op - framework
2015-04-30 18:39:32 +00:00
Svetoslav
bc4affc982 am 9e4003cd: am 729d0a06: Merge "Add process outgoing calls app op - framework" into mnc-dev
* commit '9e4003cde7dc33342042328923999ec545a8bfbf':
  Add process outgoing calls app op - framework
2015-04-30 18:29:58 +00:00
Svetoslav
ccd368087e am 71264fb2: am c27b3fca: Merge "Add SIP app op - framework." into mnc-dev
* commit '71264fb236b50de815a328d9ecab29535d1ecb17':
  Add SIP app op - framework.
2015-04-30 18:29:49 +00:00
Eino-Ville Talvala
6faa3acaad Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev 2015-04-30 18:10:31 +00:00
Svetoslav
3327f3d688 Merge "Add use fingerprint app op - framework" into mnc-dev 2015-04-30 18:05:18 +00:00
Svetoslav
729d0a06ea Merge "Add process outgoing calls app op - framework" into mnc-dev 2015-04-30 18:02:55 +00:00
Svetoslav
c27b3fca82 Merge "Add SIP app op - framework." into mnc-dev 2015-04-30 18:01:51 +00:00
Robin Lee
ddd553f2ae Device policy: use owner label instead of name
Managed provisioning does not currently set a meaningful profile owner
name. This changes to use the application label as returned by
PackageManager.getApplicationLabel which should be more descriptive.

Bug: 20679292
Change-Id: I5a0e87ef05b62879a73814e6d338e8b984b81c94
2015-04-30 18:01:46 +00:00
Andreas Gampe
fcda22b1fe Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 2015-04-30 17:53:51 +00:00
Mady Mellor
e82067b575 Add onStylusButtonPress listener to View
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.

If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.

Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
2015-04-30 09:58:35 -07:00
Alex Klyubin
588fffc23e am 84c64efe: am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
* commit '84c64efef90818888dca12f7650a632b70438a8f':
  AndroidKeyStore keys should not be handled by Bouncy Castle.
2015-04-30 16:39:11 +00:00
Alan Viverette
68999a740c am 19b9f8ef: am 8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev
* commit '19b9f8ef3eaf392db0a993ae0d5a7a84e9d6c60f':
  ActionBar SearchView's default hint shouldn't override SearchableInfo
2015-04-30 16:21:57 +00:00
John Spurlock
0f4c6a8bdf am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '1642e354ed10bc606f403ac6f529392f3f25dd2d':
  Zen: New event condition data model.
2015-04-30 16:16:13 +00:00
Alex Klyubin
403ac2d64f Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev 2015-04-30 16:12:33 +00:00
Alan Viverette
8310f87d96 Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev 2015-04-30 15:59:21 +00:00
John Spurlock
8f72b40370 Merge "Zen: New event condition data model." into mnc-dev 2015-04-30 15:45:55 +00:00
John Spurlock
d60258f2d3 Zen: New event condition data model.
- Add system condition provider for calendar event-based rules.
 - Add stub condition provider for handling event conditions.
 - Add various shared items to support new settings subpage.

Bug: 20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
2015-04-30 11:42:11 -04:00
Wei Wang
fb63b6820d am 46fa9a96: am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev
* commit '46fa9a964f5897d8f125f5ad2e25080043810233':
  Temp workaround to track max beacons.
2015-04-30 15:20:05 +00:00