Commit Graph

36415 Commits

Author SHA1 Message Date
Narayan Kamath
2ecc4dc88f am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis."
* commit 'f36fe3f85daaf9e3b3270143d6648394768bb324':
  Track changes to libcore ICU apis.
2014-06-16 11:01:29 +00:00
Narayan Kamath
5a44bdc828 am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code."
* commit '8382b0d3c6639ee0eeadec02983bfceaf5ba0a32':
  Remove some pointless code.
2014-06-16 09:54:49 +00:00
Narayan Kamath
8966fd383b am 031dec4a: am bfa6ddd0: Merge "Support deprecated language codes."
* commit '031dec4acd384ae6c5ab183139c7f91289a05f62':
  Support deprecated language codes.
2014-06-16 09:44:03 +00:00
Vinod Krishnan
61eb51b8f5 am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev
* commit '1e6048e0158310ee31e0310661bed06a41ac7dd7':
  DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows
2014-06-14 01:06:50 +00:00
Craig Mautner
916cd9770c am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
* commit '6335fbcba106147d914acae0a9d8f4fcd53af768':
  Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
2014-06-14 00:30:47 +00:00
Craig Mautner
6335fbcba1 Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
This reverts commit dd5c947170.
2014-06-13 17:18:47 -07:00
Vinod Krishnan
1e6048e015 Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev 2014-06-13 21:09:46 +00:00
Adam Powell
11335f14b9 DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows
----
Explicitly track consumed state for WindowInsets

Treating 0-insets as fully consumed is incorrect since it means that
you can't dispatch empty insets down the view hierarchy - traversal
terminates immediately. Track consumed state independent of actual
values. Replacing a given set of insets with all zeroes will mark it
consumed.
----
Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout

Fix a bug where ActionBarOverlayLayout was using a private constructor
of WindowInsets to return empty insets that should have been marked
fully consumed. This caused dispatch to further child views not to
stop appropriately, corrupting application layout in some cases.
---
Fix CTS regression in fitSystemWindows

Don't attempt to apply null insets from a call to fitSystemWindows.
Immediately return false since null insets cannot be applied.
----

Bug: 15452706
Change-Id: I34276a90305b141b4653aef0048f70350c69d02a
2014-06-13 16:51:01 -07:00
Justin Koh
0f3d3dd26c am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."
* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
  Revert "Close ActivityView and ActivityContainer cleanly."
2014-06-13 17:27:48 +00:00
Justin Koh
dd5c947170 Revert "Close ActivityView and ActivityContainer cleanly."
This reverts commit 4a9f129874.

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
2014-06-13 09:55:09 -07:00
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly.
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly.
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
2014-06-11 16:33:00 -07:00
Narayan Kamath
e79c8ce682 Support deprecated language codes.
Locale.toLanguageTag will transform the obsolete (and
deprecated) language codes "in", "ji" and "iw" to
"id", "yi" and "he" respectively.

All versions of android prior to "L" used the deprecated
language tags, so we will need to support them for backwards
compatibility.

bug: 13230947

(cherry-picked from commit 21fc8ba39c)

(also contains a partial cherry-pick of 857ba4af because
including it is the easiest way to avoid conflicts.)

Change-Id: Ia1d0f2d8e20f5679ff3990506f6468ebf789c94a
2014-06-13 19:03:13 +01:00
Narayan Kamath
1083573c2f Merge "Track changes to libcore ICU apis." 2014-06-10 21:26:11 +00:00
Narayan Kamath
2c9d2005ec Track changes to libcore ICU apis.
All private APIs that earlier accepted Locale.toString
now accept Locale instances.

Change-Id: I80df88d0c928e921320b6545b1267adecefe64af
2014-06-12 13:42:05 +01:00
Narayan Kamath
ab9a19e38c Merge "Remove some pointless code." 2014-06-10 21:16:15 +00:00
Narayan Kamath
d9d0bb64e7 Remove some pointless code.
Unnecessary disk reads for values that are never
used (and cached elsewhere, so that optimization is
rendered pointless).

Change-Id: Ic14a8b53a96908bb03eae28759d7be2c217e8125
2014-06-13 17:46:47 +01:00
Justin Koh
44195b4f90 am 42c53fd6: Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev
* commit '42c53fd64641d3c2974b3b8f25a2c600f4c4dd7d':
  Catch OperationUnsupportedException when linkifying using WebView
2014-06-10 18:35:20 +00:00
Justin Koh
7b9fa3bd11 am b7c39cee: Remove WebIconDatabase calls from android.provider.Browser
* commit 'b7c39cee9ef3b6c58987128cef77c75cc2eab215':
  Remove WebIconDatabase calls from android.provider.Browser
2014-06-10 18:35:15 +00:00
Justin Koh
42c53fd646 Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev 2014-06-10 01:05:05 +00:00
Aaron Whyte
83955cb260 Catch OperationUnsupportedException when linkifying using WebView
This fixes a CTS test for Wearable. We cannot check for FEATURE_WEBVIEW, because
there's no way to get a PackageManager from within these static methods.
Bug: 15131296

Change-Id: I7bf7564b6209f330a413ed54a94be1e07fedb30d
2014-06-09 17:59:03 -07:00
Justin Koh
b7c39cee9e Remove WebIconDatabase calls from android.provider.Browser
This class has been deprecated, so no need to call it.

Bug: 15088030
Change-Id: I6092a9d5f7a12cc14def0996efff7cb689935acb
2014-06-09 17:50:34 -07:00
Justin Koh
ce8c1086fb am eba8782a: Add NPE check to getSystemWindowInsets
* commit 'eba8782a1f8412a3510fc78a71b843ef6e89bdbb':
  Add NPE check to getSystemWindowInsets
2014-06-09 21:12:39 +00:00
Justin Koh
2be4ddc403 am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev
* commit 'a5de8479f442b7e6f8d285db58713e42fb922798':
  Fix Browser when running on a platform without webview
2014-06-09 21:12:35 +00:00
Justin Koh
eba8782a1f Add NPE check to getSystemWindowInsets
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
2014-06-09 11:31:53 -07:00
Justin Koh
b4be02088f Fix Browser when running on a platform without webview
Fix Browser: can't access the WebIconDatabase. Added build version checks so
that the icon database isn't used on devices <= KITKAT: the entire class is
deprecated as of JB MR2 anyway, according to the comments.
Bug: 15088030

Change-Id: I4403b1a429c08abb288f5ee3bae7eb2e23303916
2014-06-09 11:28:53 -07:00
Robin Lee
0b889cd66f am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId
2014-06-09 12:55:13 +00:00
Robin Lee
3d076afc37 Choose CA certificate storage according to userId
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.

This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.

Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
2014-06-09 12:45:17 +00:00
Vinod Krishnan
a3d5d3b8af am 90e96db0: Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev
* commit '90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2':
  Adding a way to stub Vpn ConfirmDialog
2014-06-06 00:16:40 +00:00
Vinod Krishnan
b0e5bbb657 Adding a way to stub Vpn ConfirmDialog
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486

Bug: 15087985

Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
2014-06-05 15:28:50 -07:00
Robin Lee
7f99341950 am 3c189e02: am 271251d7: Merge "Add Environment call: get config dir for some user"
* commit '3c189e02e42fba9d5be2c4f68f76620bae33618e':
  Add Environment call: get config dir for some user
2014-06-05 17:53:25 +00:00
Hui Lu
26f40cc36d am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev
* commit '61c0f547339ec870d42b15e84f9628631308f22f':
  Add interface name for proxy network type.
2014-06-05 17:39:09 +00:00
Hui Lu
61c0f54733 Merge "Add interface name for proxy network type." into klp-modular-dev 2014-06-05 17:36:02 +00:00
Hui Lu
c80fa71e88 Add interface name for proxy network type.
This will make test
android.net.cts.ConnectivityManagerTest#testRequestRouteToHost pass.
Change-Id: I5a14b6d705e87018e1e2c031aaacee533536a50b

Bug: 15320910
2014-06-05 17:06:13 +00:00
Robin Lee
6959133d84 Add Environment call: get config dir for some user
This returns a read-only directory accessible to any app running as the
same user, containing various configuration files written by the system.

Change-Id: I635de184fc285b8fef166b782bbc1ac79f8f0687
2014-06-05 14:34:23 +00:00
Craig Mautner
21483b9f0b am e34fcf8f: Merge "Add callback when ActivityView activities complete" into klp-modular-dev
* commit 'e34fcf8ff9a023641505a8decdeb1b77232d8a16':
  Add callback when ActivityView activities complete
2014-06-05 03:31:06 +00:00
Craig Mautner
e34fcf8ff9 Merge "Add callback when ActivityView activities complete" into klp-modular-dev 2014-06-05 03:28:21 +00:00
Craig Mautner
d94b47f3b6 Add callback when ActivityView activities complete
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.

Fixes bug 15330616.

Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
2014-06-04 17:25:49 -07:00
Elliott Hughes
ef3aeecacd am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager."
* commit '38a5a257a9aaf85606eb7117d943a877dc7d3c93':
  Minor javadoc improvements for PackageManager.
2014-06-04 22:02:34 +00:00
Elliott Hughes
759a89782d Merge "Minor javadoc improvements for PackageManager." 2014-06-04 21:26:49 +00:00
Robin Lee
c774caff86 am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"
* commit '4891a9f9cfee569c0d362f1781f44493f5e320c0':
  Assign AID_EVERYONE gid to newly-created processes
2014-06-04 21:09:52 +00:00
Robin Lee
e46e600412 Merge "Assign AID_EVERYONE gid to newly-created processes" 2014-06-04 20:51:55 +00:00
Amaury Medeiros
dde24269c1 Minor javadoc improvements for PackageManager.
- Removed duplicated use of the word "the".
- Changed @return and @param explanation of getApplicationEnabledSetting,
which should get the enabled state of an application and not just one component.

Change-Id: Ide07ec84ceb5b9b5caa28efa9ba838a40ee7b514
Signed-off-by: Amaury Medeiros <amaurymedeiros@gmail.com>
2014-06-03 20:06:41 -03:00
Craig Mautner
22af5b8428 am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev
* commit '81dfc082d2add8463469e3eac9db94d6d93005ce':
  Force all windows to redraw before unblanking screen
2014-06-03 22:44:52 +00:00
Narayan Kamath
dd2e9d3386 am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."
* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
  Scan for renderscript files before deciding ABIs.
2014-06-03 13:24:50 +00:00
Narayan Kamath
797b109c60 am 7ed98c43: Merge "Add an --abi argument to "pm install""
* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"
2014-06-03 13:24:45 +00:00
Narayan Kamath
d47e38b634 Scan for renderscript files before deciding ABIs.
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
2014-06-03 12:58:35 +01:00
Narayan Kamath
6431d11cd4 Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
2014-06-03 11:11:47 +01:00
Craig Mautner
228742d278 Force all windows to redraw before unblanking screen
The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.

Fixes bug 15092354.

Change-Id: I349995bf6446d6c462dccdc2b599bab9ab0ab2c8
2014-06-02 20:29:38 -07:00
Elliott Hughes
04c987a806 am 79067b3c: am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."
* commit '79067b3cb2f43e62b9a4d46082fb01cbcc513990':
  Move frameworks/base off private libcore.ICU API.
2014-05-31 02:29:47 +00:00