Commit Graph

43033 Commits

Author SHA1 Message Date
Narayan Kamath
bdc78678de Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 2014-08-15 04:54:19 +00:00
Narayan Kamath
f75aadc028 Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
This reverts commit 19c8ce291e89a9ef1442a20e1feab421b11536d7.

Change-Id: Ie5a5571127311e0a29f314c0566e779cfe940b53
2014-08-15 12:25:52 +00:00
Zoltan Szatmary-Ban
1e7bc0def8 Revert "Revert "Update Trusted Credentials screen in settings""
This reverts commit 0f0de0bdd021bad5f85fdb0399a4ea91a1611e25.

Change-Id: Ia3d0907e3d7c2ec42d64e45f60e3dfaffb932c3d
2014-08-15 12:55:35 +01:00
John Spurlock
4db0d98b42 Zen: Downtime now a condition provider, persist conditions.
- Persist the entire exit condition instead of only the id.
- Make downtime a proper condition provider (similar to the
  existing countdown provider for time-based conditions)
- Move all downtime-related items out of ZenModeHelper and
  into the new condition provider.
- Reevaluate downtime more often, when any of its inputs change.
- Make sure downtime appears as an available condition in the
  condition panel when applicable.

Bug:16296125
Bug:16211189
Bug:17031767
Change-Id: I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
2014-08-15 15:06:15 +00:00
Adrian Roos
65c09b10ca Remove setManagingTrust workaround
Bug: 16622870
Change-Id: Ibdfdd420996081c055d0364f77b65dea6060cb9e
2014-08-15 14:29:55 +00:00
Zoltan Szatmary-Ban
9c7ed91d78 Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 2014-08-15 04:38:54 +00:00
Zoltan Szatmary-Ban
3291de8f6c Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
This reverts commit c9249c69813c6fb889d71d84583c67ae2942e6de.

Change-Id: I5504fddaf7b18efb73cd6c76678b3b39ce9b0229
2014-08-15 14:01:14 +00:00
Zoltan Szatmary-Ban
f8d72cc14f Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
This reverts commit 87efe74e092236c372d3b6909009641123aa416a.

This should be fine now with all the dependency CLs +2-ed


Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
2014-08-15 12:58:37 +00:00
Narayan Kamath
5dc4a440d1 Merge "Validate instruction sets passed to installd." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
6c4b9de8f1 Validate instruction sets passed to installd.
We don't want folks passing down arbitrary strings.

bug: 16837404
Change-Id: I73ac66b376f1401f9f95f3c6323da6242ac8ed3d
2014-08-15 12:50:10 +01:00
Narayan Kamath
35cbf0e450 Merge "Remove system_server classes from the boot image." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
29564cd245 Remove system_server classes from the boot image.
We set the system_server classpath in the environment
(like we do with BOOTCLASSPATH). After the zygote forks
the system_server, we dexopt the classpath (if needed)
and then launch the system server with the correct
PathClassLoader. This needed several small / medium
refactorings :

- The logic for connecting to installd is now in a separate
  class and belongs in the system_server.
- SystemService / SystemServiceManager have now moved to
  classes.jar. They are only used from there, and since they
  use Class.forName, we want them to be loaded by the
  system_server classloader, and not the bootclassloader.
- BootReceiver now moves to frameworks.jar, because it is
  used by ActivityThread and friends.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
2014-08-15 13:37:03 +01:00
Zoltan Szatmary-Ban
2b13c5641a Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 2014-08-15 04:54:19 +00:00
w19976
15afd81158 Configure MTU based on network MTU parameter
Add logic to obtain the mtu from the network PCO parameter and set it to kernel
when the mobile data connection is established. When there is no PCO mtu configured
from the network, the mtu size defined in the corresponding APN will be used. In case
no mtu size is defined for an APN used for data connection, the MCC/MNC based MTU
defined  in the framework overaly will be applied.

bug:17046179
Change-Id: I6465d4b8f2076aaa380ae3617fb3f24adbe136d4
2014-08-14 20:34:13 -07:00
Jeff Davidson
56f9f73a5a Fix default scorer provisioning.
Use Settings.Global instead of SharedPreferences (which don't work) to
track whether we've run the one-time provisioning step of activating
the build-time configured default scorer.

Bug: 16980605
Change-Id: I093cdd6f4f1110960078a186191c4e02b5543d6a
2014-08-14 16:47:23 -07:00
Kenny Root
e19ca078bf Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
This reverts commit 007392a8a1.

Bug: 16660566
2014-08-14 15:58:24 -07:00
Jeff Sharkey
82d6d337b3 Merge "Some networks may have null ifaces, I guess?" into lmp-dev 2014-08-14 16:46:52 +00:00
Jeff Sharkey
9da2f1e007 Some networks may have null ifaces, I guess?
Seems like a bug further upstream, but guard ourselves against it
for now.

Bug: 17033841
Change-Id: Id0e5895c3389b63d4e34b1fb064efef8b72cd609
2014-08-14 22:42:27 +00:00
Chet Haase
9fde9a250f Merge "ActionBarOverlay needs to be focusable" into lmp-dev 2014-08-14 16:46:52 +00:00
Jason Monk
48aacba761 Fixes to lock task API from API review
Adding ComponentNames and some splitting/renaming of broadcasts.

Bug: 17005622
Change-Id: I9ece3553310fb20b0c3c3e4032b408e86384363a
2014-08-14 11:37:58 -04:00
Jinsuk Kim
8960d1b155 CEC: Replace the usage of logical address with id for HdmiDeviceInfo
Introduced 'id' of HdmiDeviceInfo to replace the direct use of logical address
as id. This accomodates the identification of MHL device with ease. Also updated
TIF to use id instead of logical address.

Bug: 16986744
Change-Id: Ifa827fb5e5fcf1d2f612f0845accbfe5c03734aa
2014-08-14 10:52:23 +09:00
Fabrice Di Meglio
b1a50f2dff Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings.
SettingsPreferenceFragment$1@273c8fdb was not registered

- add onUnbindPreferences() call to match onBindPreferences()
- this new method is @hide so it does not impact the APIs

Change-Id: Iee0ab8a4ecc2046f89fb96cc52af150e835f658c
2014-08-14 18:00:11 +00:00
Torne (Richard Coles)
e0930192be Merge "Store the WebView's package info." into lmp-dev 2014-08-12 23:14:49 +00:00
Jeff Sharkey
e9b78fdbbe Fix javadoc on PROTECTION_FLAG_APPOP.
Change-Id: I36e339ac2c6e6842441fd2572b0b8cda24bd34ca
2014-08-14 16:01:37 +00:00
Torne (Richard Coles)
84392d74fe Store the WebView's package info.
When loading the WebView, save the PackageInfo for the package so that
it can be retrieved later to access the package name, version data, etc.
This will be used to detect WebView downgrades that may affect an app's
saved WebView-related data.

Bug: 16724751
Change-Id: I05ce469308cc87f79c73206327f43b76b1bab222
2014-08-14 16:43:18 +01:00
Prerepa Viswanadham
621085e50f Protect from malformed advt with invalid manf_id/data combo
Bug: 16979645
Change-Id: Ie7ea00ed20cbad1120c7582bb2bafd44b4295052
2014-08-14 05:33:11 +00:00
Prerepa Viswanadham
ee3cc8bf17 Prevent crash in Gatt service due to null pointer in
BluetoothGattCharacteristic from framework

Bug 16899517

Change-Id: Ib30ddefee07c2953f9a7faeb4eaa823feeebdc8f
2014-08-14 05:32:06 +00:00
Wei Wang
347a882de3 Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev 2014-08-12 23:14:49 +00:00
Wei Wang
ee80922c6a Clean up advertise and scan clients upon bluetooth down.
Fixes b/16528460

This allows Advertiser and Scanner to be reused after bluetooth recycle,
which follows same behavior for BluetoothAdapter.

Also prints manufacturer data array for ScanRecord.

Change-Id: I78bca40ac294433782a054bf2a00a775dac02d96
2014-08-13 11:08:48 -07:00
Jose Lima
235510e672 Made AlarmClockInfo a nested class in AlarmManager
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
2014-08-14 02:10:41 +00:00
Jose Lima
4b6c6697da Renamed "media playing" APIs to "visible behind"
- Request from API Review: rename the media playing APIs to a more
     generic name, reflecting the background visibility feature these
     methods actually control.
   - Made the new isActivityVisibleBehind().
   - Changed convertFromTranslucent() and convertToTranslucent() to be
     SystemApi.

Bug: 16959028
Change-Id: I526eac22f44273b3254dd6201f89194d13e597e2
2014-08-14 02:00:04 +00:00
Jeff Brown
c12035cd40 Log who is calling goToSleep().
Change-Id: Ibae61c90ee115735835e878bb3bf79eedaa0ae44
2014-08-14 01:56:48 +00:00
Dianne Hackborn
9c3e74f1f7 Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
...can lead to launching of un-exported activities

We now validate the array map after unparcelling to make sure there
are no duplicate keys.

And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values.  There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.

Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
2014-08-13 17:24:45 -07:00
Doug Zongker
f0433e50c7 Merge "@hide RECOVERY permission" into lmp-dev 2014-08-12 23:14:35 +00:00
Jorim Jaggi
84a3e7aacf Use different unlock animation when going to full shade
Also fixes a bug that the notify flag was not reset, and fix the
transition for the phone/camera affordance (in these cases, no
animation is needed).

Bug: 15991916
Change-Id: Idbb4fa40f86bda597cd66cc38da838ef4f75514d
2014-08-14 12:29:25 +00:00
Alan Viverette
f2546bf423 Merge "Add API for obtaining max text length for accessibility" into lmp-dev 2014-08-12 23:14:35 +00:00
Jim Miller
989b68e82d Merge changes I77f49fe8,I305e927a into lmp-dev
* changes:
  API review - move confirm credential constants from Intent
  Revert "Add new intent to prompt user for their device credential."
2014-08-12 23:14:48 +00:00
Jim Miller
66093a9024 API review - move confirm credential constants from Intent
Moves constants from Intent to KeyguardManager.

Fixes bug 17006280

Change-Id: I77f49fe85850a501e1531d39aad7446c9bca5801
2014-08-15 00:38:21 +00:00
Jim Miller
4d64746d6a Revert "Add new intent to prompt user for their device credential."
Move API to KeyguardManager.

Fixes bug 17006280

This reverts commit 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26.

Change-Id: I7b58bb4d9db828028c1021f17b01745c5ec2161e

Conflicts:
	core/java/android/content/Intent.java
2014-08-15 00:35:50 +00:00
Glenn Kasten
3750e75f75 Merge "Move setting to disable automatic USB routing" into lmp-dev 2014-08-12 23:14:35 +00:00
Yorke Lee
15f83c6f64 Disable call log for users with DISALLOW_OUTGOING_CALLS restriction
Bug: 16217514
Change-Id: Iacd5699d0a540ca0e5a678662379bf8c611f7462
2014-08-13 21:17:53 +00:00
Glenn Kasten
34cc4db180 Move setting to disable automatic USB routing
This moves the setting from System to Secure per review.

Bug: 16381952
Change-Id: I2497ca66b4f346839490c29295528fac70e94494
2014-08-13 13:31:04 -07:00
Amith Yamasani
95ab784944 Decouple user limit from guest creation
Allow Guest to be created even if there are N users.
Allow N users to be created even if there are N-1 users
   and a Guest.
Limit number of guests and managed profiles that can
be added.

Added unit tests.

Bug: 15934700
Change-Id: I1a8f0fa38a91d71ef7b2980e05c974244dfc337a
2014-08-13 20:09:20 +00:00
Alan Viverette
f32efebf9b Fix TextView clickable state when using onClick attribute
Change-Id: I67347f3c80958e47abc124f1a8c0ffec01175378
2014-08-15 00:36:17 +00:00
Chris Craik
3c3f601cc4 Merge "Fix action bar background drawing" into lmp-dev 2014-08-12 23:14:35 +00:00
Chris Craik
1e610d479f Fix action bar background drawing
bug:16940717

Fixes regression from 0de8add60e0d40c59def41663acae4d57d0b4b15

Change-Id: I7ec30a9c0c9422874cad106a2caeb7dcbe75e1b6
2014-08-13 13:44:40 -07:00
Jeff Sharkey
437e61d5ad Merge "Fix javadoc attr reference." into lmp-dev 2014-08-12 23:14:35 +00:00
Jeff Sharkey
9f991a2f3e Fix javadoc attr reference.
Change-Id: I330ba0cac66b4515388287c0ec4856e3ce6c93cb
2014-08-13 18:38:55 +00:00
Dianne Hackborn
3c9ad6ebd8 Merge "Fix some IntentFilter docs." into lmp-dev 2014-08-12 23:14:35 +00:00
Dianne Hackborn
dc894046be Fix some IntentFilter docs.
Change-Id: I1dc6feb41bf275583d8b25ed5ca98d2b1432c752
2014-08-12 18:59:28 -07:00