Commit Graph

36926 Commits

Author SHA1 Message Date
cc28a41b48 Camera2: Correct some minor errors in awb region spec
Also correct some other typos.

Change-Id: Ib7ac65cd82d06a20aa47cce10a9976a3ac405142
2014-02-24 15:11:23 -08:00
be85725e1e Merge "Damage IsolatedZVolume when shadows change" 2014-02-24 21:22:24 +00:00
ee64201004 Merge "Add back resize buffer" 2014-02-24 20:41:16 +00:00
aec25d9224 Merge "Improve how battery stats collects network stats." 2014-02-24 20:33:42 +00:00
462c2177f7 Check for ongoing detachment in AbsListView
BUG: 13167767
Change-Id: Ie1a828eadbb99daef46af77544f233fee09fd1bc
2014-02-24 12:24:47 -08:00
d0c5b9abed Improve how battery stats collects network stats.
This optimizes the path for battery stats to collect
per-uid network usage.  It now collects wifi and mobile
usage separately, with a path that allows it to recycle
all data structures and filter out stats it isn't
interested in before they come back to java.

This is setting us up for the actual goal, to collect
mobile stats independently each time the mobile radio
goes down, allowing us to distribute mobile radio usage
across uids based on the number of packets they transferred
during a session.

Change-Id: I21a0f517cf087ea5aa8b8dd535e20b46e361a52b
2014-02-24 11:35:20 -08:00
35e2721399 Merge "Check for null view root before checking for accessibility focus" 2014-02-24 19:09:59 +00:00
2e6fc8ca56 Check for null view root before checking for accessibility focus
BUG: 13168971
Change-Id: Ia75d77b18112371f56a624e11f9509f14ec98093
2014-02-24 11:09:18 -08:00
688084914d Merge "Camera2: update 3A state related metadata key docs" 2014-02-24 18:40:03 +00:00
60b19dc2df Camera2: update 3A state related metadata key docs
Bug: 12840262
Change-Id: I2092e1d24b262a0568b880094b8ad6a87510b346
2014-02-24 10:19:20 -08:00
4845037a48 Merge "Add the calling package name to requestRouteToHost" 2014-02-24 18:09:36 +00:00
875e2101d7 Fix missing # in method name in javadoc.
Fix doc generation.

Change-Id: I2e333a7224eeaff7a870fedc7f7a4eb113d1fe2f
2014-02-24 14:11:56 +00:00
e0ebe276e5 Merge "Remove trailing spaces and tabs" 2014-02-24 11:20:49 +00:00
66996dafa7 Remove trailing spaces and tabs
Actual fix will be covered by subsequent patches.

BUG: 12954290
Change-Id: I55f2374fd447d5b3d5a696de6f9b493e32f4e17a
2014-02-24 19:51:04 +09:00
627de95925 Merge "Enables a profile owner or device owner to set and clear default intent handler activities." 2014-02-24 10:16:28 +00:00
cc3f33853b Allow alpha modulation in ColorStateList items
This makes it much easier to define a disabled state color as an alpha
modulation of some base color.

Change-Id: Ie2ecf40b1f6560fcd8eda208d780616dddfc0d08
2014-02-22 16:52:46 -08:00
92a507986a am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit '3dc57b39f2a87fe3692b5606de2b0c0693fc485c':
  Fixes for ActivityView on home activity
2014-02-22 07:51:02 +00:00
c004c9a87f am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit 'ffda464851008f750246f343c939d8003071cd23':
  Fixes for ActivityView on home activity
2014-02-22 07:33:24 +00:00
12ff7391a1 Fixes for ActivityView on home activity
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.

Fixes bug 13119389.

Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
2014-02-21 21:08:00 -08:00
e56e9df5f1 Add back resize buffer
Bug: 12825810

Change-Id: Ic2329c30524010f54778101853b30f8f8d9eeb6c
2014-02-21 18:12:04 -08:00
ff641477a7 Damage IsolatedZVolume when shadows change
bug:12874322
Change-Id: I3dd92f551dfb00965ccd08647586f378f8949b1c
2014-02-21 16:59:56 -08:00
550267f72b Fix refactoring of invalidate methods
Was incorrectly clearing the DRAWN flag and updating mLastIsOpaque from
partial invalidations, though why this should be different is somewhat
of a mystery.

BUG: 13138721
Change-Id: Ic8d11a64406bc78e94adec7355c1f50d87567887
2014-02-21 16:48:33 -08:00
4418372b21 am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
2014-02-22 00:46:52 +00:00
3b49a8a629 Fix typo in invalidate
BUG: 13138721
Change-Id: If7e10208c3ba752eca5f5cbcf26f8a63b1f4ad51
2014-02-21 16:37:32 -08:00
0cab896a98 resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
2014-02-21 16:35:52 -08:00
f4f4e863be Fix conditional in invalidateInternal
BUG: 13138721
Change-Id: I433faff7d3e93796dca59ac5b2706c59901558ba
2014-02-21 16:19:06 -08:00
dc8d7db35a Merge "Fix transient state, accessibility focus in ListView, GridView" 2014-02-21 23:19:21 +00:00
c8124a1e79 Merge "add new accessibility action for EditText to set text content" 2014-02-21 22:28:22 +00:00
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
9224e045b3 Merge "Don't assume that we're at start of file at ctor time" 2014-02-21 20:59:45 +00:00
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
d98fff4a02 Merge "ConnectivityService: add support to set TCP initial rwnd" 2014-02-21 20:55:13 +00:00
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
503923220c Merge "Fix scrolling when the bound target offset is too high" 2014-02-21 19:13:17 +00:00
00b9829202 Fix scrolling when the bound target offset is too high
BUG: 13033556
Change-Id: I7a61548d3c604f004726117b40882f84ddf75337
2014-02-21 11:11:01 -08:00
3a4ab768a9 Merge "Invalidate projection receiver, refactor invalidate methods" 2014-02-21 18:49:18 +00:00
9b30512e59 camera3: Fix raw/DNG tag visibilility.
Change-Id: Ie3beed773b27bf56689a750e695ac7cb82580639
2014-02-21 10:25:26 -08:00
8eb91e9f28 Merge "camera3: Add green split property." 2014-02-21 18:07:05 +00:00
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
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
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
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
e253b514f4 am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
  Miscellaneous small documentation fixes.
2014-02-21 17:28:51 +00:00
4a80927241 Merge "Fix documentation for Parcel.readException()." 2014-02-21 17:21:52 +00:00
8d41e653ba Merge "Miscellaneous small documentation fixes." 2014-02-21 17:19:21 +00:00
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
25c55ca902 am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"
* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
  Remove unused JNITest class
2014-02-21 16:47:43 +00:00
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
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
2fb1fa6c88 Merge "AArch64: Make AssetAtlasService 64-bit compatible" 2014-02-21 14:15:44 +00:00