Commit Graph

44944 Commits

Author SHA1 Message Date
Amith Yamasani
3de84d0de6 am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev
* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
  Use the correct method to check if device is encrypted
2014-10-17 18:58:58 +00:00
Amith Yamasani
a865bb5df8 Merge "Use the correct method to check if device is encrypted" into lmp-dev 2014-10-17 18:55:58 +00:00
Amith Yamasani
cd410ba4e8 Use the correct method to check if device is encrypted
DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.

Check if the device is encrypted by some means, instead.

Also fix a SecurityException when Device Admin queries encryption state
(recent regression)

Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
2014-10-17 11:43:57 -07:00
Dianne Hackborn
53cf2d4b9f am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
* commit '52476989b8afc0e96c2218625031ed550b12c79b':
  SDK only: hide the old L API version constant.
2014-10-17 17:15:02 +00:00
Neil Fuller
5a135a1cbb am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
  Removing some more FloatMath references
2014-10-17 14:59:41 +00:00
Neil Fuller
9b0109eb05 am c7aa8fe6: Merge "Removing some more FloatMath references"
* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
  Removing some more FloatMath references
2014-10-17 14:54:17 +00:00
Neil Fuller
c7aa8fe623 Merge "Removing some more FloatMath references" 2014-10-17 14:48:17 +00:00
Dianne Hackborn
d3511d4be1 SDK only: hide the old L API version constant.
Also update the LOLLIPOP version constant to describe more things
that change when you target it.

Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
2014-10-16 17:49:45 -07:00
Prerepa Viswanadham
e51f6f84e5 am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '248edc3e969217aec1fcce7f324cbae6c46da0a3':
  Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 16:11:36 +00:00
Prerepa Viswanadham
248edc3e96 Update javadoc comments for getBluetoothLeAdvertiser()
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities

bug: 18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
2014-10-16 16:06:44 +00:00
Neil Fuller
4ef9403577 am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '8a3785cafec4b47fe8d61614b04a0e193d616428':
  Replacing FloatMath native implementation with calls to Math
2014-10-16 09:32:33 +00:00
Neil Fuller
8a3785cafe am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
* commit 'fd2d41b742339d278f4a66f78a7c161108985ed8':
  Replacing FloatMath native implementation with calls to Math
2014-10-16 09:24:18 +00:00
Neil Fuller
fd2d41b742 Merge "Replacing FloatMath native implementation with calls to Math" 2014-10-16 08:16:24 +00:00
Brian Carlstrom
c8a8701c2e am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
* commit '20de619d66a594fd9e6e76a3a2cb79422aef577c':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 01:19:51 +00:00
Brian Carlstrom
20de619d66 Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 2014-10-16 01:01:26 +00:00
Jim Miller
839685bc57 am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
  Add a checkbox option to 'require password to decrypt'
2014-10-15 18:26:02 +00:00
Jim Miller
e7c325559d Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev 2014-10-15 18:21:52 +00:00
Amith Yamasani
54be1ea752 am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
  Fix admin policies in managed profiles
2014-10-15 17:48:50 +00:00
Amith Yamasani
2c3886cb34 Merge "Fix admin policies in managed profiles" into lmp-dev 2014-10-15 17:44:24 +00:00
Amith Yamasani
242f4b1259 Fix admin policies in managed profiles
Some of the admin policies are throwing security exceptions in
a managed profile without being documented correctly and others
shouldn't be throwing security exceptions.

Changed setCameraDisabled() to not throw an exception. It now just
prevents work profile apps from using the camera.

Changed wipeData() to allow passing in ERASE_EXTERNAL_STORAGE. In
secondary users/profiles, this is just going to remove the user, so
the flag is harmless.

Updated documentation for setKeyguardDisabledFeatures() and resetPassword()
to indicate that they cannot be called in a managed profile.

Bug: 17987913
Change-Id: I8060be4c2d32bdd4edb46ce543551fabb9c8c983
2014-10-15 10:42:17 -07:00
Jeff Sharkey
96b46ebaee am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
  Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:53:28 +00:00
Jeff Sharkey
97d47ed036 Reduce PackageInstaller Binder memory pressure.
When restoring hundreds of apps on low-DPI devices, we end up sending
icon Bitmaps inline in the response instead of splitting into ashmem
regions.  To avoid triggering TransactionTooLargeException, switch to
using ParceledListSlice under the hood.

Bug: 17926122
Change-Id: Ib4da6775e79d2fcb4aaea15f58ed998df203a5f9
2014-10-15 09:19:54 -07:00
Neil Fuller
12f427d0b5 am 1802567a: am e4625cc1: Merge "Fix Time docs to document various error cases"
* commit '1802567a79b2fc94aa1dff387cd55db8521cdca6':
  Fix Time docs to document various error cases
2014-10-15 16:05:56 +00:00
Neil Fuller
1802567a79 am e4625cc1: Merge "Fix Time docs to document various error cases"
* commit 'e4625cc1a861615f4b3447e2a4d4990590d51470':
  Fix Time docs to document various error cases
2014-10-15 16:01:01 +00:00
Neil Fuller
e4625cc1a8 Merge "Fix Time docs to document various error cases" 2014-10-15 15:56:06 +00:00
Neil Fuller
7079f2003c Fix Time docs to document various error cases
Bug: https://code.google.com/p/android/issues/detail?id=76386
Change-Id: Ibb71405b70453d5abaf45426ec4e36261b6695cf
2014-10-15 12:08:05 +01:00
Neil Fuller
32b88b48da Replacing FloatMath native implementation with calls to Math
On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.

When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.

Example timings:

Mako AOSP AOT:

Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns

Mako AOSP interpreted:

Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns

Other calls Mako AOT:

Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns

The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I8d1947d88b3c576643138b1df589fb9da7c1ab88
2014-10-15 11:47:58 +01:00
Neil Fuller
6de42dac43 Removing some more FloatMath references
See frameworks/base commit 33253a4baa
for details.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I46d4ee4c4be7972e3bcc6782fb50f024b6fff1ee
2014-10-15 11:45:45 +01:00
Narayan Kamath
8091edbffb Set threads' contextClassLoader during LoadedApk.makeApplication.
We used to set this from LoadedApk.getClassLoader. This had
the unfortunate side effect of clobbering the threads default
classloader when Context.createPackageContext().getClassLoader()
was called. This happens, for example, to every app that uses
a updatable webview.

bug: 17986934
Change-Id: If2b5938a19f836ea5fe60c94ea53a7125c2098c0
2014-10-15 11:38:44 +01:00
Jeff Sharkey
40a13df16f am 97978808: Start cross profile intents as caller.
* commit '9797880808320e3a7bae1f59bc7e0c5a13189e5f':
  Start cross profile intents as caller.
2014-10-15 01:59:18 +00:00
Jeff Sharkey
9797880808 Start cross profile intents as caller.
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.

Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
2014-10-14 17:57:28 -07:00
Jim Miller
6848dc8e3b Add a checkbox option to 'require password to decrypt'
Fixes bug 17881324

Change-Id: Id94e593a172d686339c736473226fece1bb749ee
2014-10-14 16:26:11 -07:00
Jeff Hao
de4abc8472 am dbfbb175: Backport of ordering apps for boot dexopt.
* commit 'dbfbb17512fe6a5b3c7198d60b6a149969174a71':
  Backport of ordering apps for boot dexopt.
2014-10-14 22:31:20 +00:00
Jeff Hao
dbfbb17512 Backport of ordering apps for boot dexopt.
This is a squashed commit of the following changes:

1. Order apps by priority when performing boot dexopt.
   (cherry picked from commit 65cde7d42d)

2. Improve priority ordering of apps when performing boot dexopt.
   Added core apps and updated system apps.
   (cherry picked from commit 272bf3a274)

3. Stop boot dexopt when low on memory.
   (cherry picked from commit 1d892dcb6b)

Bug: 17641843
Change-Id: Ie32f1c21047d3462aaf728f7633fecf647ba2b47
2014-10-14 15:02:37 -07:00
Amith Yamasani
d5a628d757 am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
* commit '15a5f82f9b6b389614b1df78749bd627d97d5417':
  Hide DISALLOW_OUTGOING_BEAM API
2014-10-14 19:54:14 +00:00
Amith Yamasani
15a5f82f9b Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 2014-10-14 19:51:15 +00:00
Dianne Hackborn
9e6f7e4526 am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev
* commit '35de0e2872b64f78b596a850d6da2c483ba65bb5':
  Fix issue #10034864: Define YouTube application as the preferred...
2014-10-14 19:21:04 +00:00
Dianne Hackborn
35de0e2872 Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 2014-10-14 19:16:22 +00:00
Dianne Hackborn
f85e7af4d0 Fix issue #10034864: Define YouTube application as the preferred...
...handler for its Intents

Fix bug when a third party app is installed as an additional but
worse match for the intent.

Also raise up the limit for when we start printing logs about
overly large strict mode data.

And turn off the logs about services being created and destroyed,
since with the way things are using services these days these have
become way too spammy.

Change-Id: I8fe301dfd80fb4b70213cb7783b7c5426245278d
2014-10-14 10:46:52 -07:00
Amith Yamasani
6d93491f50 Hide DISALLOW_OUTGOING_BEAM API
This is not fully functional in managed profiles, so it is being removed for L.

Bug: 17973040
Change-Id: If660e5e565076cdf61649e9f5ca12877425e9df3
2014-10-14 09:31:30 -07:00
Jesse Hall
95e14460d4 am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
2014-10-13 22:03:12 +00:00
Jesse Hall
d7e559675c Surface: Leave object in unlocked state when unlockCanvasAndPost fails
If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.

Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.

This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)

Bug: 17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
2014-10-13 11:01:15 -07:00
Marcin Kosiba
1de5704943 am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
* commit '437517573b53b17765eba9b0b98055915bf3a4a1':
  Remove the default WebView text encoding resource entirely.
2014-10-13 09:44:58 +00:00
Marcin Kosiba
437517573b Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 2014-10-13 09:37:36 +00:00
George Mount
316b1d42b9 am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
* commit '1a285496fb504d4c4d41e97a7c3b67210c1a67ef':
  Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
2014-10-10 20:52:14 +00:00
George Mount
1a285496fb Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev 2014-10-10 20:48:10 +00:00
George Mount
5ac9b20b41 Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
Bug 17938614

Change-Id: Ia341fdd63ab57ec16a3de6349b7eb07fdc0a48ae
2014-10-10 13:22:36 -07:00
Christopher Tate
ab9e3f5e57 am 1133e29f: Tweak wallpaper restore rejection threshold
* commit '1133e29f22252cc36102f41204c3de35779e49d2':
  Tweak wallpaper restore rejection threshold
2014-10-10 18:05:46 +00:00
Christopher Tate
1133e29f22 Tweak wallpaper restore rejection threshold
Raise the height ratio threshold slightly in order to start accepting
restores of height=1920 images onto height=2560 devices.

Bug 17882661

Change-Id: I63b47817fdf754cda9a052bddb62aee764522c6f
2014-10-10 17:54:14 +00:00
Marcin Kosiba
fd1ac83f63 Remove the default WebView text encoding resource entirely.
Having the default text encoding in config.xml makes it seem like
it's something that could be changed, but upon further inspection
we can't see any good reason for anyone to ever want to change it
from UTF-8.

BUG: 17634120
Change-Id: I10a09ab1d65590c29efb10222abfa08ca52b5c84
2014-10-10 17:20:58 +01:00