Commit Graph

55021 Commits

Author SHA1 Message Date
Todd Kennedy
9f86026444 resolved conflicts for 7de7e0b0 to stage-aosp-master
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-09-25 15:06:49 -07:00
Todd Kennedy
fa54ab7950 Pass dexopt flags as integer
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.

Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
2015-09-25 13:52:33 -07:00
Todd Kennedy
4e32174517 resolved conflicts for cafacef6 to stage-aosp-master
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
2015-09-24 14:34:06 -07:00
Andreas Gampe
55fe944f98 Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
(cherry picked from commit 06bb908b78)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-24 12:27:25 -07:00
Elliott Hughes
aa31169804 am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
  WrapperInit: remove dead execStandalone method
2015-09-22 15:42:36 +00:00
Daniel Micay
13eac10a26 WrapperInit: remove dead execStandalone method
This became dead with the removal of support for the non-runtime-init
code path in f48029f00a.

Change-Id: Id68e0da4658e83f0d3bfd8645152165faacac5fa
2015-09-21 18:14:56 -04:00
Alan Viverette
48c7e6f3dc am 24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()"
* commit '24ff6823c411f794aceaae89b0b029fbf8ef6b29':
  prevent unnecessary warning logs caused by View.toString()
2015-09-18 20:11:44 +00:00
Alan Viverette
24ff6823c4 Merge "prevent unnecessary warning logs caused by View.toString()" 2015-09-18 19:59:20 +00:00
kenzyun_chen
90ebb99b36 prevent unnecessary warning logs caused by View.toString()
If the id is negative, it is not from Resource.
Passing the negative value to getResourcePackageName makes AssetManager dump unnecessary warning logs.
It is reasonable not to get package/type/entry information for the negative id.

The warning logs :
W/ResourceType( 3711): No known package when getting name for resource
number 0x9b010100

Change-Id: Ic89acb4f32205ba5a2fdac61dc14b00ccf251148
2015-09-18 18:30:30 +08:00
Shawn Willden
b63b8fb40a Update KeymasterDefs
Change-Id: Iea788eb81c24dcaceeea35a6b004416caa1cf9c6
2015-09-10 14:00:34 -06:00
Yasuhiro Matsuda
10191dd9d2 am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '53f1a815b4401f10cd833217143da44ab0408dcc':
  Remove unnecessary finally blocks for tracing.
2015-09-04 02:34:58 +00:00
Yasuhiro Matsuda
25878b2888 Remove unnecessary finally blocks for tracing.
BUG: 22207144
Change-Id: I2b15bb7c4055a1ad589b433d4f253868813ab311
2015-09-03 16:27:13 +09:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
ef57e5e03b Merge "Add trace code to system server." 2015-09-02 12:54:23 +00:00
Nick Kralevich
712205bac0 am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"."
* commit '9d586927102b597845607ccc82661e350821de82':
  Automatically assign default seinfo labels using the string "default".
2015-09-01 16:37:59 +00:00
Robert Craig
5e16bc5a14 Automatically assign default seinfo labels using the string "default".
default seinfo values are those for which policy lacks a
matching stanza in the corresponding mac_permissions.xml
file. Prior to this change the null object reference was
used to represent the non-matching state. This is in
contrast to a policy supplied default stanza which will
assign a non null seinfo value. Confused yet?

Basically, two default states were distinguished in the
code to describe the two cases where either a policy stanza
spelled out the base case seinfo label or not. Policy
writers could either supply a default stanza or rely on
the class instantiated value assigned by the ApplicationInfo
object. The hope was that the later assignment could be
used to help distinguish the cases where policy writers
intentionally white listed apps. This change will just use
the hard coded "default" string implicitly to describe all
cases and removes the idea of a policy supplied default stanza.

Change-Id: Ib7b01ee004775f24db9a69340a31784b967ce030
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2015-09-01 05:51:04 -04:00
Yasuhiro Matsuda
1ab43d5978 Add trace code to system server.
- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.

BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327
2015-08-27 12:22:07 +09:00
Alan Viverette
3b83e5bf7b am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
* commit '9513785715e2325ee3a3269fbfe7b1f4409eff5c':
  Avoid NPE when getPositionForView() is called on detached view
2015-08-26 20:45:42 +00:00
Alan Viverette
9513785715 Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev 2015-08-26 20:38:53 +00:00
Alan Viverette
898c7045e0 Avoid NPE when getPositionForView() is called on detached view
Bug: 23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
2015-08-26 15:22:09 -04:00
Chien-Yu Chen
44674d69eb am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit 'e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
  Camera: Update for reprocess session
2015-08-26 19:07:06 +00:00
Chien-Yu Chen
e4c3ff2f50 Merge "Camera: Update for reprocess session" into mnc-dev 2015-08-26 18:56:15 +00:00
Chien-Yu Chen
e90c6d0ad2 Camera: Update for reprocess session
Document that some devices may not support submitting multiple
outputs in a single reprocess capture requests. Remove the
guaranteed reprocess session configurations that are less common
and may not be supported by all devices.

Bug: 23422291
Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
2015-08-25 11:58:21 -07:00
Eino-Ville Talvala
d14e1f2fbd am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
  Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:12:37 +00:00
Eino-Ville Talvala
2bf7b98a2a Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev 2015-08-24 23:08:00 +00:00
Eino-Ville Talvala
e3f5483977 Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.

As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.

Guard the filtering correctly, to correctly support such
devices.

Bug: 23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
2015-08-24 14:08:58 -07:00
Eino-Ville Talvala
d803ef138d am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
* commit '08b12dfba630659601972f0d857b6580fdae4313':
  Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:39:09 +00:00
Eino-Ville Talvala
08b12dfba6 Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev 2015-08-22 05:33:26 +00:00
Eino-Ville Talvala
a52995cc90 am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
* commit 'a7dde2e89ec9a8c0ce5460d4f57d1e561f16520f':
  Camera: Fix depth documentation issues
2015-08-22 00:25:37 +00:00
Eino-Ville Talvala
a7dde2e89e Merge "Camera: Fix depth documentation issues" into mnc-dev 2015-08-22 00:14:13 +00:00
Eino-Ville Talvala
315bc09715 Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
This ensures that sizes don't change after being initially inspected,
and/or stale size information isn't reused incorrectly.

Bug: 22092273
Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393
2015-08-21 16:31:58 -07:00
Fyodor Kupolov
950297d27f am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
* commit 'e6c64508aba566b5bd4ac9cd87a07358b13f5a06':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-21 23:12:14 +00:00
Fyodor Kupolov
e6c64508ab Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 2015-08-21 23:04:09 +00:00
Jim Miller
d8f61f201d am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
* commit '74d9c2aad1bcd52933a8dba7752b28e9aef1902d':
  Fix type-o in FingerprintManager documentation
2015-08-21 22:11:10 +00:00
Jim Miller
74d9c2aad1 Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 2015-08-21 21:59:51 +00:00
Fyodor Kupolov
7d35fc3898 Fixed a typo in convertRestrictionsToBundle JavaDoc
Bug: 23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0
2015-08-21 11:25:55 -07:00
Fyodor Kupolov
8a363bb13d am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
* commit '1773ded84684593f459b19f3271d471b38f14f85':
  Fixed key comparison in equals method
2015-08-20 19:56:02 +00:00
Fyodor Kupolov
1af7a83939 Fixed key comparison in equals method
Bug: 23376695
Change-Id: Ie4bd55a88f5f86fd8de7b087d0a5f1755951e90d
2015-08-20 10:24:14 -07:00
Jim Miller
5f69ca3be3 Fix type-o in FingerprintManager documentation
Fixes bug 23274133

Change-Id: I15607d0e64c0b11d36d0e0d47ea88c42101e4dde
2015-08-20 05:06:36 +00:00
Jeff Sharkey
746aee22e8 am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
  Pass underlying volume UUID to StorageVolume.
2015-08-20 01:33:46 +00:00
Jeff Sharkey
f3ad1eabc1 Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 2015-08-20 01:28:30 +00:00
Eino-Ville Talvala
abf0b8b0a8 Camera: Fix depth documentation issues
- Correct spelling of quaternion
- LENS_INTRINSIC_CALIBRATION and LENS_RADIAL_DISTORTION were not
  linkifying correctly

Bug: 23360503
Change-Id: I9c5acc0087d7115548b75ccfa1bc1eb1866557b2
2015-08-19 16:21:15 -07:00
Jeff Sharkey
8e2ea2a9f1 Pass underlying volume UUID to StorageVolume.
To help MediaProvider uniquely identify storage devices, pass through
the UUID of the underlying private storage volume.

Bug: 23329611
Change-Id: I22ee7ea98fcb208d7797310acb3396a3f074f09b
2015-08-19 14:16:05 -07:00
Lorenzo Colitti
c4b6cee6c8 am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
  Don't mark NetworkRequests restricted when they don't have restricted caps
2015-08-19 20:55:01 +00:00
Lorenzo Colitti
11e84bde9e Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into mnc-dev 2015-08-19 20:48:31 +00:00
Dianne Hackborn
4519b64fda am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
2015-08-19 18:31:29 +00:00
Paul Jensen
aae613d961 Don't mark NetworkRequests restricted when they don't have restricted caps
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted.  Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.

Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
2015-08-19 11:08:38 -04:00
Dianne Hackborn
865b79b43b Fix issue #23326715: Clarify --checkin/-c options in batterystats
Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
2015-08-18 17:33:00 -07:00
Tao Bao
9d995335f0 am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."
* commit '2e3746abc7d70dd72f60a7912cd45472f3032acb':
  Recursively delete directories in handleAftermath().
2015-08-18 22:41:32 +00:00
Tao Bao
5065e12dbe Recursively delete directories in handleAftermath().
RecoverySystem.handleAftermath() is called to clean up recovery-related
files. It needs to handle non-empty directories as well such as leftover
stashes from failed OTAs.

Bug: 23199081
Change-Id: I33fb326d376d04c793ad7b5948a10e8c1c572812
2015-08-18 13:48:17 -07:00