124199 Commits

Author SHA1 Message Date
Deepanshu Gupta
9be03c4e98 Update layoutlib tests to check methods return value.
The test in layoutlib bridge has been updated to check the return
value of the delegate method match the value of the overriden method.

This changeset also fixes the problems found due to this change.

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
2014-02-21 16:22:10 -08:00
Adam Lesinski
4c90185a35 am 542b55d9: am c8661519: am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '542b55d9a4bee2f98f8a0a6948e0873c5faaddc7':
  Fix broken IME when decrypting storage
2014-02-22 00:20:57 +00:00
Alan Viverette
f4f4e863be Fix conditional in invalidateInternal
BUG: 13138721
Change-Id: I433faff7d3e93796dca59ac5b2706c59901558ba
2014-02-21 16:19:06 -08:00
Chad Brubaker
c023453a2b Only allow System apps to make VPN exempt routes
requestRouteToHost will only allow system applications to make routes
exempt from the VPN's routing rules.

If a VPN is currently running and a non-system app requests a route it
will only succeed if that host is currently covered by a VPN exempt
routing rule. Otherwise it will fail.

For example, if a VPN is running and the MMS network is brought online
those routes will be added as VPN exempt. If an application then tries
to request a route to a MMS endpoint it will succeed because the routes
already exist. If an application tries to request a route to a host
covered by the VPN the call will fail.

Bug: 12937545
Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f
2014-02-21 15:30:02 -08:00
Alan Viverette
dc8d7db35a Merge "Fix transient state, accessibility focus in ListView, GridView" 2014-02-21 23:19:21 +00:00
Guang Zhu
c8124a1e79 Merge "add new accessibility action for EditText to set text content" 2014-02-21 22:28:22 +00:00
Adam Lesinski
542b55d9a4 am c8661519: am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit 'c866151926b7672a58a7312c8083612bdc567fb4':
  Fix broken IME when decrypting storage
2014-02-21 22:19:50 +00:00
Adam Lesinski
c866151926 am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '83930aa09aecef7429d8a1c07b80f10b7e2e13f6':
  Fix broken IME when decrypting storage
2014-02-21 22:17:26 +00:00
Adam Lesinski
83930aa09a Merge "Fix broken IME when decrypting storage" into klp-modular-dev 2014-02-21 22:13:44 +00:00
Adam Lesinski
8793dd873d Fix broken IME when decrypting storage
Bug:13113499
Change-Id: Icf767864c8ff694fd569b9237ae1004cc20204a2
2014-02-21 14:06:47 -08:00
Greg Hackmann
9e413bf4e5 am bbfc08b3: Merge changes I6d4fdada,Ia34899a4
* commit 'bbfc08b3abc0934f67659f3238eb79dcac838c17':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
2014-02-21 13:04:00 -08:00
Greg Hackmann
bbfc08b3ab Merge changes I6d4fdada,Ia34899a4
* changes:
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
2014-02-21 21:01:00 +00:00
Christopher Tate
9224e045b3 Merge "Don't assume that we're at start of file at ctor time" 2014-02-21 20:59:45 +00:00
Christopher Tate
b048c33d5b Don't assume that we're at start of file at ctor time
BackupDataReader / BackupDataWriter were implicitly assuming that when
instantiated, the underlying fd was positioned at start-of-file.  If one
tried to e.g. open an existing data stream to append further data to it,
things might randomly fail (at read time, possibly when consuming the
stream later) due to incorrect alignment of the data entities: the
appending writer would assume that no padding was needed to achieve
correct alignment, and this might easily be false.

Now the underlying native reader/writer helpers recognize the true
position within the file when constructed, and as a result it's now
safe to e.g. construct a BackupDataOutput for an existing file and
then append to it.

Change-Id: If0484921e687852f923a4b4efabff573a6c16981
2014-02-21 12:58:04 -08:00
JP Abgrall
d98fff4a02 Merge "ConnectivityService: add support to set TCP initial rwnd" 2014-02-21 20:55:13 +00:00
JP Abgrall
32d1ac4d45 ConnectivityService: add support to set TCP initial rwnd
The value for the TCP initial receive window comes from,
in order,

kernel
  /proc/sys/net/ipv4/tcp_default_init_rwnd

init.rc (via properties)
  net.tcp.default_init_rwnd

properties
  net.tcp.default_init_rwnd

gservices
  Settings.Global.TCP_DEFAULT_INIT_RWND

Bug: 12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
2014-02-21 12:05:20 -08:00
Marco Nelissen
6e89ddc046 Add method to get redirected Uri
Change-Id: I32c35e1cae89ee1106e8eabff0a4673af8cf57cd
2014-02-21 12:00:42 -08:00
Alan Viverette
503923220c Merge "Fix scrolling when the bound target offset is too high" 2014-02-21 19:13:17 +00:00
Alan Viverette
00b9829202 Fix scrolling when the bound target offset is too high
BUG: 13033556
Change-Id: I7a61548d3c604f004726117b40882f84ddf75337
2014-02-21 11:11:01 -08:00
Alan Viverette
3a4ab768a9 Merge "Invalidate projection receiver, refactor invalidate methods" 2014-02-21 18:49:18 +00:00
Ruben Brunk
9b30512e59 camera3: Fix raw/DNG tag visibilility.
Change-Id: Ie3beed773b27bf56689a750e695ac7cb82580639
2014-02-21 10:25:26 -08:00
Ruben Brunk
8eb91e9f28 Merge "camera3: Add green split property." 2014-02-21 18:07:05 +00:00
Greg Hackmann
c9244720da open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Setting the time-of-day clock is still useful on systems where the RTC
device is not yet brought up or otherwise unavailable.  This matches the
in-kernel behavior of the Android alarm driver.

Change-Id: I6d4fdadab12e241ada7419425efd55bd13873c55
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-02-21 09:53:25 -08:00
Greg Hackmann
38bf514668 Move time setting code from SystemClock to AlarmManagerService
On devices using /dev/rtc instead of /dev/alarm, updating the
time-of-day clock and RTC are separate syscalls.  Hence the clock and
RTC could be left in inconsistent states if two threads called
SystemClock.setCurrentTimeMillis() simultaneously.

By moving this code into AlarmManagerService, we can put a global lock
around AlarmManagerService.setTime() and prevent the race condition.

Note that access to SystemClock.setCurrentTimeMillis() is now gated by
android.permission.SET_TIME, where before it was gated by filesystem
permissions (i.e., could the process write to /dev/alarm or /dev/rtc).

Change-Id: Ia34899a4cde983656305fd2ef466dfe908ed23c8
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-02-21 09:53:19 -08:00
Elliott Hughes
5784f159ab am 48dcf9d5: am d7d37256: am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '48dcf9d5f59acf53a3ac0eda141ec323534a3321':
  Fix documentation for Parcel.readException().
2014-02-21 17:37:58 +00:00
Elliott Hughes
449e46600f am 0047d3e0: am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '0047d3e025b43fd2dc05734f7ea6229291445046':
  Miscellaneous small documentation fixes.
2014-02-21 17:37:54 +00:00
Elliott Hughes
48dcf9d5f5 am d7d37256: am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()."
* commit 'd7d37256c4bab388e99dae5e16b80a59756cc97d':
  Fix documentation for Parcel.readException().
2014-02-21 17:33:41 +00:00
Elliott Hughes
0047d3e025 am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit 'e253b514f4ef74a23c784d2cd893eb035d1c793f':
  Miscellaneous small documentation fixes.
2014-02-21 17:33:38 +00:00
Elliott Hughes
d7d37256c4 am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()."
* commit 'b2f07b27725bed9716114c46df2cf636eb366f6f':
  Fix documentation for Parcel.readException().
2014-02-21 17:28:54 +00:00
Elliott Hughes
e253b514f4 am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
  Miscellaneous small documentation fixes.
2014-02-21 17:28:51 +00:00
Elliott Hughes
b2f07b2772 am 4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '4a80927241b3168d9d5138c46c22385d6467a736':
  Fix documentation for Parcel.readException().
2014-02-21 09:25:54 -08:00
Elliott Hughes
29d60b95fa am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '8d41e653bae240488281d430309e2d501e9524e5':
  Miscellaneous small documentation fixes.
2014-02-21 09:25:50 -08:00
Elliott Hughes
4a80927241 Merge "Fix documentation for Parcel.readException()." 2014-02-21 17:21:52 +00:00
Elliott Hughes
8d41e653ba Merge "Miscellaneous small documentation fixes." 2014-02-21 17:19:21 +00:00
Robin Lee
c53bd971ba Merge "Check DeviceOwner exists before using packageName" 2014-02-21 17:16:11 +00:00
Craig Mautner
ae39c6283b am c72f5c2d: am ec5c3b90: am c2c0a61c: Add copyright notice to files missing them.
* commit 'c72f5c2de565ab3c46176155f3414cc154b5df39':
  Add copyright notice to files missing them.
2014-02-21 17:06:08 +00:00
Craig Mautner
c72f5c2de5 am ec5c3b90: am c2c0a61c: Add copyright notice to files missing them.
* commit 'ec5c3b9040625e53e3f5cff1fe3d963b936065f0':
  Add copyright notice to files missing them.
2014-02-21 17:01:48 +00:00
Narayan Kamath
2b20f6db9c am a1aeac80: am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"
* commit 'a1aeac80df09cf8d481474264b1ce78ed64e7464':
  Remove unused JNITest class
2014-02-21 16:58:33 +00:00
Narayan Kamath
35eeb2d859 am 61910447: am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"
* commit '6191044729b2dace9c9b4b15b19a8839377d8973':
  Fixes for 64bit in libhwui
2014-02-21 16:58:28 +00:00
Craig Mautner
ec5c3b9040 am c2c0a61c: Add copyright notice to files missing them.
* commit 'c2c0a61cf5f779b4726f089f28d966c03ccbba54':
  Add copyright notice to files missing them.
2014-02-21 16:55:55 +00:00
Narayan Kamath
a1aeac80df am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"
* commit '25c55ca902f570d3a89753c6eb9492c20dd734ba':
  Remove unused JNITest class
2014-02-21 16:53:43 +00:00
Narayan Kamath
6191044729 am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"
* commit '7942397b3174a9642996979ae8b4aafb313dc2e2':
  Fixes for 64bit in libhwui
2014-02-21 16:53:40 +00:00
Narayan Kamath
25c55ca902 am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"
* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
  Remove unused JNITest class
2014-02-21 16:47:43 +00:00
Narayan Kamath
7942397b31 am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"
* commit '192563407964926537d688d4098054c3834341c0':
  Fixes for 64bit in libhwui
2014-02-21 16:47:38 +00:00
Narayan Kamath
911b2ce3da am 4a642ee5: Merge "Remove unused JNITest class"
* commit '4a642ee5e65ca47ecf6cb274096162e580aac922':
  Remove unused JNITest class
2014-02-21 08:34:36 -08:00
Narayan Kamath
1925634079 am 22c66639: Merge "Fixes for 64bit in libhwui"
* commit '22c66639093a634b5688372d261d003b0478c450':
  Fixes for 64bit in libhwui
2014-02-21 08:34:30 -08:00
Sander Alewijnse
f475ca33d9 Enables a profile owner or device owner to set and clear default intent handler activities.
Those intent handlers are persistent preferences. They will remain the default intent
handler even if the set of potential event handlers for the intent filter changes
and if the intent preferences are reset.

Change-Id: Id0cfae46f93c10d89e441f272096a205ec518dd0
2014-02-21 15:24:20 +00:00
Narayan Kamath
4a642ee5e6 Merge "Remove unused JNITest class" 2014-02-21 15:02:31 +00:00
Ashok Bhat
42f06b0e22 Remove unused JNITest class
JNITest class is no longer actively used. This patch
removes the class (java and jni) files.

JNI interfaces and calls are extensively tested in
the art unit tests (art/tests) and in cts (see
CtsJniTestCases).

Change-Id: I62f7c72deb5d206fa3f545ae39a9cb9011110d0a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-21 14:34:35 +00:00
Narayan Kamath
22c6663909 Merge "Fixes for 64bit in libhwui" 2014-02-21 14:23:57 +00:00