drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
213,127 Commits 1 Branch 0 Tags
Commit Graph

213127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
70df552ac2 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:32:07 +00:00
Baligh Uddin
31f0d18a03 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:32:05 +00:00
Chad Brubaker
b4b53b0741 Merge "Add initial network security config implementation" am: 8c35820720 
am: 0bafbbfcb4

* commit '0bafbbfcb4cbb6e6f20c0309f5c4242be83f18d7':
  Add initial network security config implementation
 2015-11-05 18:58:39 +00:00
Chad Brubaker
0bafbbfcb4 Merge "Add initial network security config implementation" 
am: 8c35820720

* commit '8c358207206c5e19541c65e3f9761d1adb54550b':
  Add initial network security config implementation
 2015-11-05 18:52:46 +00:00
Brian Carlstrom
f73e78fe1c Merge "Fixes for sm and pm usage" am: ffb15da518 
am: 671d5965f7

* commit '671d5965f7b15ecba10453e8f445418dc0e730e6':
  Fixes for sm and pm usage
 2015-11-05 18:48:22 +00:00
Chad Brubaker
8c35820720 Merge "Add initial network security config implementation" 2015-11-05 18:46:24 +00:00
Brian Carlstrom
671d5965f7 Merge "Fixes for sm and pm usage" 
am: ffb15da518

* commit 'ffb15da518e35727e218bfba48927902d4368e2f':
  Fixes for sm and pm usage
 2015-11-05 18:42:53 +00:00
Brian Carlstrom
ffb15da518 Merge "Fixes for sm and pm usage" 2015-11-05 18:38:56 +00:00
Brian Carlstrom
82bfca4609 Fixes for sm and pm usage 
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"

Bug: 20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
 2015-11-05 10:33:40 -08:00
Jeff Sharkey
f131e1aae9 Kick movement preconditions onto handler thread. 
The bulk of package moving already occurs on the handler thread,
but one of the precondition steps requires that we make an installd
call to calculate disk space of the app.  If there was already
another long-running installd call going on, we could end up ANR'ing
the caller.

Since movePackage() is already designed to return a moveId and go
async, we can push all the precondition steps onto the handler thread
to prevent the ANR.

Bug: 25490003
Change-Id: I62d555c23bbf81b791f6f4cabc40c3d64c580cf8
 2015-11-05 10:28:43 -08:00
Dan Albert
e0bcc4efe9 Merge "Don\'t apply clang flag to gcc builds." am: d9a1b35df6 
am: a41288b88f

* commit 'a41288b88f18273a61ed0af977408761598216cf':
  Don't apply clang flag to gcc builds.
 2015-11-05 18:28:19 +00:00
Dan Albert
a41288b88f Merge "Don\'t apply clang flag to gcc builds." 
am: d9a1b35df6

* commit 'd9a1b35df62eddc56f69281aea1534d187b63205':
  Don't apply clang flag to gcc builds.
 2015-11-05 18:22:57 +00:00
Dan Albert
d9a1b35df6 Merge "Don't apply clang flag to gcc builds." 2015-11-05 18:18:45 +00:00
Chris Craik
e0fa7476a5 Revert "Remove -ffast-math from libhwui makefile" 
This reverts commit e02ec7c37a92fd63748a610bac6a23d0409788cf.

Change-Id: Iea7fadf04c4ffa62be28f783342ae749f89bf931
 2015-11-05 17:58:28 +00:00
Deepanshu Gupta
ceb2b54909 Merge "Fix Switch colors" into mnc-ub-dev 
am: 71093465ab

* commit '71093465abbdf887c705b40fb0cb8a2919894c4b':
  Fix Switch colors
 2015-11-05 17:24:38 +00:00
Deepanshu Gupta
71093465ab Merge "Fix Switch colors" into mnc-ub-dev 2015-11-05 17:21:16 +00:00
Deepanshu Gupta
c9b8f95c99 Fix Switch colors 
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.

Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
 2015-11-05 09:20:07 -08:00
Dan Albert
0eadf57cad Don't apply clang flag to gcc builds. 
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).

Bug: http://b/22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
 2015-11-05 00:59:09 -08:00
Dan Albert
b0624da118 Use std::unique_ptr instead of UniquePtr. 
We're deprecating UniquePtr, so we need to move to the real thing.

Bug: http://b/22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
 2015-11-05 00:57:12 -08:00
Svetoslav Ganov
f7db8e407b Merge "Take into account default app for default grants" am: 82eeb2f20c 
am: 0c7e9262a1

* commit '0c7e9262a1cc89b748e281f330dd1ffecec6df3f':
  Take into account default app for default grants
 2015-11-05 02:30:08 +00:00
Svetoslav Ganov
1809ccc62e Merge "Enforce weaker grant if app is default handler for miltiple action" am: 035374d7a2 
am: a9b62e1330

* commit 'a9b62e13305d9cb43f53831f0b92d72bd490c1ae':
  Enforce weaker grant if app is default handler for miltiple action
 2015-11-05 02:28:40 +00:00
Svetoslav Ganov
0c7e9262a1 Merge "Take into account default app for default grants" 
am: 82eeb2f20c

* commit '82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
  Take into account default app for default grants
 2015-11-05 02:25:32 +00:00
Svetoslav Ganov
a9b62e1330 Merge "Enforce weaker grant if app is default handler for miltiple action" 
am: 035374d7a2

* commit '035374d7a29b4e0b0bc71bdfb3555b2e547ce1da':
  Enforce weaker grant if app is default handler for miltiple action
 2015-11-05 02:23:44 +00:00
Svetoslav Ganov
82eeb2f20c Merge "Take into account default app for default grants" 2015-11-05 02:19:12 +00:00
Svetoslav Ganov
035374d7a2 Merge "Enforce weaker grant if app is default handler for miltiple action" 2015-11-05 02:19:00 +00:00
Svetoslav
5db602fd19 Enforce weaker grant if app is default handler for miltiple action 
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
 2015-11-05 02:18:13 +00:00
Teng-Hui Zhu
cf22d184a3 When the incoming light source is invalid, don't generate any shadow 
b/25417885

Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
 2015-11-04 17:04:18 -08:00
Baligh Uddin
c94647cfb3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I20cf8ac4a5039ead0a65bd2e38ded78542a7a3e8
 2015-11-04 15:59:57 -08:00
Baligh Uddin
599c81d0ea Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I924e59eeff537a0f66ae7ac7ace1dacd1f89f35e
 2015-11-04 15:57:40 -08:00
Baligh Uddin
f231f4fccb Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I200b933f68468a0e919d917ac93b33e4526bc1d0
 2015-11-04 15:48:25 -08:00
Baligh Uddin
40fa6b1e91 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I44df802e45a340d7ef7f094c6c06001d350bb0c5
 2015-11-04 15:46:28 -08:00
Baligh Uddin
c1a6632df5 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I17d9389bfd2a83e57d20cb5de3e227cc34e09cbe
 2015-11-04 15:44:21 -08:00
Baligh Uddin
a1d63092b7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I55bd76c512148127b06a36950cf66da55c9295dc
 2015-11-04 15:39:05 -08:00
Baligh Uddin
e22fb216ee Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I76a9ab65d1fe10e2915e5cd794a5cbce1697a933
 2015-11-04 15:36:55 -08:00
Baligh Uddin
a1065cf5d9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I924dde8b982ce94128882b484e9c3e9dc5c49013
 2015-11-04 15:34:55 -08:00
Baligh Uddin
8ff8892c12 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I76cc8d18dd82f9af09310685a88843eeb71a991c
 2015-11-04 15:32:37 -08:00
Baligh Uddin
7ca7920f8d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: Iec5d9e5b20c530e3056e2410af42fd8af8c16788
 2015-11-04 15:30:29 -08:00
Baligh Uddin
87428865b2 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I790f09439e904a82ed90ec07f6bbdab1e8ef42d8
 2015-11-04 15:28:25 -08:00
Baligh Uddin
5bc5bb57f3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I87a141d9b4b2ac688432d52e1bbe15626b1f301b
 2015-11-04 15:26:15 -08:00
Baligh Uddin
29aa638aec Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I31e759c6b0da2ecb71418aa3033f832a9ee42250
 2015-11-04 15:24:05 -08:00
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
Riley Andrews
132bb1e4b1 Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d am: 2c740f1dcf 
am: 6c1144dc0f

* commit '6c1144dc0f8b2452ca2a204ca471e2d23339d5a3':
  Convert ashmem bitmap thresholds to constants.
 2015-11-04 20:37:18 +00:00
Riley Andrews
6c1144dc0f Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d 
am: 2c740f1dcf

* commit '2c740f1dcf7bfd75a1dde2f7403cb25ae6559556':
  Convert ashmem bitmap thresholds to constants.
 2015-11-04 20:30:48 +00:00
Riley Andrews
2c740f1dcf Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev 
am: c8bb39d98d

* commit 'c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
  Convert ashmem bitmap thresholds to constants.
 2015-11-04 20:24:36 +00:00
Riley Andrews
c8bb39d98d Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev 2015-11-04 20:18:35 +00:00
Baligh Uddin
185269d3e9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I3ae0e8f44a5933c708d072f2053dbde77795e411
 2015-11-04 11:56:04 -08:00
Baligh Uddin
3a68edba5c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I46efa0b9d7293d80c68cb6a1e21dfaa509c6d7d2
 2015-11-04 11:51:55 -08:00
Chris Craik
34e9b5b2e4 Merge "Early return when the scale is 0." into mnc-dr-dev am: 10eb6ab94b am: 8b581e2bc7 
am: a853bb450c

* commit 'a853bb450ce7e6f06220a86dcc171a837d30511b':
  Early return when the scale is 0.
 2015-11-04 19:46:47 +00:00
Chris Craik
289c3ba2c4 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am: c4aaf0f4b8 am: 62b16e2e10 
am: 1938c39f77

* commit '1938c39f77a52c1058e7b2434bdc5d08ed9053b9':
  Remove -ffast-math from libhwui makefile
 2015-11-04 19:40:04 +00:00
Chris Craik
a853bb450c Merge "Early return when the scale is 0." into mnc-dr-dev am: 10eb6ab94b 
am: 8b581e2bc7

* commit '8b581e2bc797d3b470ad7ff3d362a998b42da4ea':
  Early return when the scale is 0.
 2015-11-04 19:40:02 +00:00