74363 Commits

Author SHA1 Message Date
Chad Brubaker
6bc1e3966c Add initial network security config implementation
Initial implementation of a unified application wide static
network security configuration.

This currently encompases:
* Trust decisions such as what trust anchors to use as well as static
  certificate pinning.
* Policy on what to do with cleartext traffic.

In order to prevent issues due to interplay of various components in an
application and their potentially different security requirements
configuration can be specified at a per-domain granularity in addition
to application wide defaults.

This change contains the internal data structures and trust management
code, hooking these up in application startup will come in a future
commit.

Change-Id: I53ce5ba510a4221d58839e61713262a8f4c6699c
2015-11-04 14:31:18 -08:00
Tao Bao
5d562d4d2f Merge "Clean up the uncrypted OTA package on bootup." 2015-10-21 17:30:04 +00:00
Mathieu Chartier
6421da8f46 Fix read_mapinfo to recognize free list large object space
Bug: 25081604
Change-Id: Ie277fd964afcdc80b97432cbd611a8136a2059d7
2015-10-19 15:22:06 -07:00
Tao Bao
87212ad6a8 Clean up the uncrypted OTA package on bootup.
An OTA package needs to be uncrypted before rebooting into recovery if
it sits on an encrypted /data partition. Once uncrypt gets started, we
cannot re-run it on the package again. Because the file may have been
fully or particially uncrypted and we may end up with a corrupt file
under recovery. Always clean up the package when the device boots into
the normal system to avoid that.

Bug: 24973532
Change-Id: I91682c103d1f2b603626c4bf8d818bced71e3674
2015-10-19 14:49:09 -07:00
tiger_huang
ff58e30aca Disassociate system windows from apps
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.

This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).

This change is related to the following changes:
a5d29971f8
15ed2754a3
c3672cd3f7
41725dedc3

Bug:
https://code.google.com/p/android/issues/detail?id=189710

Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
2015-10-16 12:30:38 +08:00
Adam Lesinski
7caa8f14a7 Merge "Make 'idmap --scan' accept more than one input directory" 2015-10-12 18:53:25 +00:00
Mårten Kongstad
83ab0d7c18 Make 'idmap --scan' accept more than one input directory
The 'idmap --scan' command was limited to only scan a single directory
for overlay packages. Update idmap to support any number of directories.

Change-Id: I851f5720a3c1d844235911a0833670652a20a3c8
2015-10-07 19:45:09 +02:00
Alan Viverette
f518ad0a49 Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup" 2015-10-07 16:38:02 +00:00
Alan Viverette
f8ac5c3469 Merge "Reset the setOnKeyListener callback when view is destroyed" 2015-10-07 16:36:58 +00:00
Alan Viverette
e229f5ddde Merge "Text size for empty view shall be styled according to theme" 2015-10-07 16:30:36 +00:00
Alan Viverette
43f0fdc5cd Merge "Remove hard-coded DrawSelectorOnTop on ListFragment's default ListView." 2015-10-07 16:27:26 +00:00
Alan Viverette
6a06f12c3f Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams" 2015-10-07 16:23:36 +00:00
Alan Viverette
7de6ae159e Merge "To call TypedArray.recycle() when we are done with the array." 2015-10-07 16:22:36 +00:00
Daniel Erat
d3e3d8896e am c3f37589: Merge "Update instructions in IPowerManager.aidl."
* commit 'c3f37589e04a52c109c63f6411db444500d4f92c':
  Update instructions in IPowerManager.aidl.
2015-09-30 21:30:31 +00:00
Daniel Erat
c3f37589e0 Merge "Update instructions in IPowerManager.aidl." 2015-09-30 21:21:33 +00:00
Daniel Erat
22f58762e1 Update instructions in IPowerManager.aidl.
Clarify IPowerManager.aidl's instructions for keeping the
C++ implementation in sync.

Change-Id: Ic51a3844483031e71fe2cfa1d3e8a065df86d119
2015-09-30 14:55:35 -06:00
Baligh Uddin
e2c9b91f53 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:40:29 +00:00
Baligh Uddin
268c1d9058 Import translations. DO NOT MERGE
Change-Id: I7de2baf9bc397126186b682cd5893629d4a8a33b
Auto-generated-cl: translation import
2015-09-29 01:27:34 -07:00
Dan Willemsen
f21beb12f9 am 899110f3: Merge "Add exported include dir for libandroid_runtime"
* commit '899110f3012eb9ab2056d8ee182d5bdab0ecae19':
  Add exported include dir for libandroid_runtime
2015-09-28 21:23:57 +00:00
Dan Willemsen
899110f301 Merge "Add exported include dir for libandroid_runtime" 2015-09-28 21:14:42 +00:00
Todd Kennedy
9f86026444 resolved conflicts for 7de7e0b0 to stage-aosp-master
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-09-25 15:06:49 -07:00
Dan Willemsen
81944da434 Add exported include dir for libandroid_runtime
The libnativehelper global include dir is being removed.

Bug: 18903857
Change-Id: I6f1bed76372ccedbe7feb4d215ba8c1c0fc0a87f
2015-09-25 14:08:45 -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
Todd Kennedy
cafacef60e Merge "Frameworks/base: Propagate boot status to installd" 2015-09-24 20:35:09 +00: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 06bb908b78e3c790d3db52fef9f2ab0a129e53cd)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-24 12:27:25 -07:00
Elliott Hughes
b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
2015-09-24 10:01:32 -07:00
Elliott Hughes
a884d81e86 Merge "constify JNINativeMethod function pointer tables" 2015-09-24 16:01:15 +00:00
Daniel Micay
76f6a86de2 constify JNINativeMethod function pointer tables
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
2015-09-22 17:10:35 -04: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 f48029f00a66e23d7872a00b56fbcf88528ba476.

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
Alan Viverette
1ebac03cbe am a5ec056b: Merge "CalendarView: use theme attribute instead of style on MonthName TextView"
* commit 'a5ec056b8331b2560f5c6f9543471884894914f1':
  CalendarView: use theme attribute instead of style on MonthName TextView
2015-09-10 12:19:40 +00:00
Young-Ho Cha
a3843cfb96 CalendarView: use theme attribute instead of style on MonthName TextView
Change-Id: I0d891ab08e61df7422fb0aea50a4c31196792189
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
2015-09-10 15:11:42 +09: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