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

186863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Wilson
2c89469d5c am fd395ce7: am d0077829: am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev 
* commit 'fd395ce7f33bda1e4ff72bebcc4c0b4e56b8232d':
  Frameworks/base: Support dex2oat threads system property
 2015-04-03 14:51:51 +00:00
Julia Reynolds
3370e446b1 Merge "Store the device initializer componentname in addition to package." 2015-04-03 14:30:18 +00:00
Olawale Ogunwale
b1e8e5e505 Merge "Remove debugging for bug 19823482." 2015-04-03 14:22:31 +00:00
Julia Reynolds
eaafdf72a4 Store the device initializer componentname in addition to package. 
This removes ambiguity about which component in the initializer
package handles device initialization when setting up secondary users.
Bug: 19992262

Change-Id: I2e48168907725a56cd05d0b51c9f28b34fa28d1a
 2015-04-03 08:27:34 -04:00
Greg Hackmann
492e501f9a Merge "aapt2: fix definition of G in Util.h" 2015-04-03 04:03:52 +00:00
Greg Hackmann
1fce4f9c89 aapt2: fix definition of G in Util.h 
Change-Id: Icbefa425cf543f130deabab9e2e2e6c13ab672d3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2015-04-02 20:31:17 -07:00
Craig Mautner
eb0e38a812 Remove debugging for bug 19823482. 
Change-Id: Ibedfb3353e6f7f64e39ad076b329d9cd9657fe5f
 2015-04-02 20:22:54 -07:00
John Spurlock
ad80b437f9 Merge "Zen: Add a new level: alarms-only." 2015-04-03 03:03:46 +00:00
John Spurlock
4f1163c83e Zen: Add a new level: alarms-only. 
Like no-interruptions, but allows alarms.

Bug: 19260237
Change-Id: I36bf0a333362256c8e54cd83992cb46c3bcb7f69
 2015-04-02 23:00:40 -04:00
Dongwon Kang
f8515ea431 Merge "TIF: Add time shift APIs." 2015-04-03 01:37:43 +00:00
dcashman
3425dae8dc Merge "Refactor KeySet code." 2015-04-03 00:52:50 +00:00
Adam Lesinski
e6c28f7c3a Merge "AAPT2" 2015-04-03 00:06:34 +00:00
Adam Lesinski
6f6ceb7e14 AAPT2 
First checking of AAPT2. The individual phases of AAPT2 work, but there
are some missing pieces.

For early testing we are missing:
- Need to properly mark file references and include them in package
- Need to package into zip

Final AAPT for apps we are missing:
- Need to crush PNGs
- Need to parse 9-patches
- Need to validate all of AndroidManifest.xml
- Need to write align method to align resource tables for splits.

Final AAPT for apps + system we are missing:
- Need to handle overlays
- Need to store comments for R file
- Need to handle --shared-lib (dynamic references too).

New AAPT features coming:
- Need to import compiled libraries
    - Name mangling
    - R file generation for library code

Change-Id: I95f8a63581b81a1f424ae6fb2c373c883b72c18d
 2015-04-02 17:02:48 -07:00
Svetoslav
d945e6b485 Merge "Do not clear a shared user's permissions on an app install." 2015-04-02 23:55:21 +00:00
Svetoslav
d2cf3aec60 Do not clear a shared user's permissions on an app install. 
When regranting permissions for an app during an install if
that app is in a shared user we should not clear the permissions
as the permissions for the shared user are additive and go away
when apps requesting them are uninstalled.

bug:20050689

Change-Id: I82aa70669fc25a45e7020a1545b093db5525f5cf
 2015-04-02 16:52:00 -07:00
Tor Norbye
2a53812cfa Merge "Fix resource type annotations for obtainStyledAttributes" 2015-04-02 23:45:22 +00:00
Raph Levien
f673acb6c9 Merge "Add Paint.hasGlyph method" 2015-04-02 23:27:24 +00:00
Raph Levien
f7f969e67e Add Paint.hasGlyph method 
This patch adds a method to determine whether a typeface has a glyph
to support a particular Unicode character or sequence.

The implementation is based on shaping the text and checking for the
presence of .notdef glyphs, and counting the number of glyphs in the
ligature case. In the case of variation selector control characters, it
currently just returns false because there is no variation selector
support yet (Mongolian Free Variation Selectors work because they're
shaped with GSUB instead).

Change-Id: I8ee4ae0d6e81a0ac57f961eb02dcc35aabd87042
 2015-04-02 23:14:58 +00:00
Jeff Brown
fd93eaf278 Merge "Clarify settings update code." 2015-04-02 23:12:51 +00:00
Simon Wilson
fd395ce7f3 am d0077829: am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev 
* commit 'd007782986a8b4b90ab622339749271993379839':
  Frameworks/base: Support dex2oat threads system property
 2015-04-02 23:12:23 +00:00
Simon Wilson
d007782986 am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev 
* commit 'fb397cf827d2f0c2e1a2aca496c75752da11bc3f':
  Frameworks/base: Support dex2oat threads system property
 2015-04-02 23:04:25 +00:00
Tenghui Zhu
9764b40898 Merge "Revert "Revert "Use AVD for checkbox animation.""" 2015-04-02 22:59:18 +00:00
Chris Craik
ec3c97d27f Merge "Add compat path for restore underflow" 2015-04-02 22:38:49 +00:00
Chris Craik
3891f3ad59 Add compat path for restore underflow 
bug:19829784

Change-Id: Ia761664208ab80c055ca11174db3ddc74457b92b
 2015-04-02 15:30:32 -07:00
Alex Klyubin
f4c301bdf5 am 58031d5e: am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine." 
* commit '58031d5eb5531f8bc45ac1789ea1cc9134591358':
  Improve the AndroidKeyStore-backed HMAC state machine.
 2015-04-02 22:02:45 +00:00
Alex Klyubin
7f5b87692b resolved conflicts for merge of e7e705d4 to master 
Change-Id: If3e8c985f4f122f9fb36aab206787aac1407a74e
 2015-04-02 14:58:27 -07:00
Tor Norbye
c91531a863 Fix resource type annotations for obtainStyledAttributes 
Change-Id: I7681249ff46d687675d0dcd7d4f077646efba687
 2015-04-02 14:51:16 -07:00
Alex Klyubin
58031d5eb5 am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine." 
* commit '378df98eab65547f62cb900e9dca0b7419095755':
  Improve the AndroidKeyStore-backed HMAC state machine.
 2015-04-02 21:34:52 +00:00
Alex Klyubin
e7e705d494 am acee5b2b: am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec." 
* commit 'acee5b2b4902479fabfb557aba745d352d49ce1a':
  Expose new key use constraints in KeyPairGeneratorSpec.
 2015-04-02 21:34:48 +00:00
Alex Klyubin
378df98eab am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine." 
* commit '3cc9e5d68d89ea1ffa79ad6981585bc46362c4a7':
  Improve the AndroidKeyStore-backed HMAC state machine.
 2015-04-02 21:25:56 +00:00
Alex Klyubin
acee5b2b49 am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec." 
* commit '9635a56acfe3318d9ae5020727090a2dc8c118d0':
  Expose new key use constraints in KeyPairGeneratorSpec.
 2015-04-02 21:25:50 +00:00
Alex Klyubin
3cc9e5d68d Merge "Improve the AndroidKeyStore-backed HMAC state machine." 2015-04-02 21:06:28 +00:00
Alex Klyubin
f4f0671618 am a44e7fd6: am 957e982c: am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues." 
* commit 'a44e7fd6228638f25472e331241a5d1f5cfaacbf':
  Add exception types for AndroidKeyStore key validity issues.
 2015-04-02 21:04:08 +00:00
Alex Klyubin
9635a56acf Merge "Expose new key use constraints in KeyPairGeneratorSpec." 2015-04-02 21:03:11 +00:00
Simon Wilson
fb397cf827 Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev 2015-04-02 20:57:53 +00:00
Alex Klyubin
a44e7fd622 am 957e982c: am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues." 
* commit '957e982cd5fdbf45817500abf68fe8a0689adc34':
  Add exception types for AndroidKeyStore key validity issues.
 2015-04-02 20:53:05 +00:00
Alex Klyubin
957e982cd5 am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues." 
* commit 'd2eec1a7865dd552114b330fce1a1472a9e08806':
  Add exception types for AndroidKeyStore key validity issues.
 2015-04-02 20:42:59 +00:00
Andrew Solovay
2cc841af91 am 93b3d665: am 7818f205: am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '93b3d6658762a84b23cd3421d0f41e4d82693cc3':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:38:20 +00:00
Yuichi Araki
a4dc29a721 am 428c2fa0: am c3fbf13d: am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit '428c2fa0f8b3c49e8bd48458c15363fcd98e8944':
  Fix a broken link in javadoc
 2015-04-02 20:38:08 +00:00
Andrew Solovay
93b3d66587 am 7818f205: am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '7818f205e5b18d8d7fddcf01736d546cb08bfd62':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:29:28 +00:00
Yuichi Araki
428c2fa0f8 am c3fbf13d: am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit 'c3fbf13d525a0bcf1202618b197f4160750b54f1':
  Fix a broken link in javadoc
 2015-04-02 20:29:24 +00:00
Alex Klyubin
d2eec1a786 Merge "Add exception types for AndroidKeyStore key validity issues." 2015-04-02 20:24:48 +00:00
Andrew Solovay
7818f205e5 am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f99a16c943a4366bdfdba19534457f9e45538f7d':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:19:15 +00:00
Yuichi Araki
c3fbf13d52 am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit 'e2fc3adbb4040400496aebdab80c4cac1083da27':
  Fix a broken link in javadoc
 2015-04-02 20:19:09 +00:00
Andrew Solovay
f99a16c943 am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '589a272e97d1f24abee1bdfce18ab88cbd5f12a9':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:10:55 +00:00
Yuichi Araki
e2fc3adbb4 am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit '61ce6c9b705e41800662b33601c01a4848c174d3':
  Fix a broken link in javadoc
 2015-04-02 20:10:48 +00:00
Andrew Solovay
589a272e97 am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 19:56:41 +00:00
Yuichi Araki
61ce6c9b70 am 776cf41d: Fix a broken link in javadoc 
* commit '776cf41d7c8f239d20397886f2120407396cfc87':
  Fix a broken link in javadoc
 2015-04-02 19:56:35 +00:00
Andrew Solovay
f2ff12ba00 Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 2015-04-02 19:25:25 +00:00
Dongwon Kang
6f0240cf63 TIF: Add time shift APIs. 
Change-Id: I4faecd99d9e565c7228fc4b9da99e2adf1e67f19
 2015-04-02 12:11:25 -07:00