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

123387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
675d44ad23 am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV" 
* commit '12f1f5b87326a31f4c69e949a1e645e82c9152d4':
  frameworks/base: fix errors inside ALOGV
 2014-02-10 22:09:12 +00:00
Colin Cross
12f1f5b873 am 40545f32: Merge "frameworks/base: fix errors inside ALOGV" 
* commit '40545f32d3364604dac0c21a0310c26f7596e3a8':
  frameworks/base: fix errors inside ALOGV
 2014-02-10 14:06:09 -08:00
Colin Cross
40545f32d3 Merge "frameworks/base: fix errors inside ALOGV" 2014-02-10 22:02:50 +00:00
Dianne Hackborn
9358dcca6f Maybe fix issue #12957738: SecurityException in... 
...Multiple Processes: uid 10069 does not have
android.permission.UPDATE_DEVICE_STATS.

Change-Id: Ibabb5b09d52412df8bebdc85a584f89e175b1ec5
 2014-02-10 13:47:39 -08:00
Amith Yamasani
9348ac8249 Fix NPE on removing a user 
Bug: 12957232

Check for null mDeviceOwner.

Change-Id: I107dc24d1a8de121ebd2c1bb56e1af40bb1c55ac
 2014-02-10 13:43:18 -08:00
Michael Wright
a407d6a003 Remove SkRegion dependency from libinput 
This gets us one step closer to removing our dependency on Skia, which is at
least one of the things blocking us from moving the input system out of
f/b.

Change-Id: I755e6267996c93fe700f1056327386923287575a
 2014-02-10 12:59:34 -08:00
John Spurlock
976ed21215 Merge "Fix NPE in PolicyControl." 2014-02-10 20:43:15 +00:00
Eino-Ville Talvala
d8fd67931e camera2: Clean up cross-references 
Change-Id: I7410293a13f65768a2aeed1490662735f73987cb
 2014-02-10 12:41:04 -08:00
John Spurlock
b8c37e2507 Fix NPE in PolicyControl. 
Bug:12957738
Change-Id: I8051a7a0656f50ed63321f9a79faf0383d7c66b4
 2014-02-10 15:36:24 -05:00
Leon Scroggins III
3393f390a5 Merge "Decode file descriptor from the correct offset." 2014-02-10 20:30:50 +00:00
Deepanshu Gupta
eaddb84962 am f7193bf8: am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement. 
* commit 'f7193bf89780039cf924dd7d1bb67f4830517231':
  Improve text rendering and measurement.
 2014-02-10 20:04:05 +00:00
Deepanshu Gupta
f7193bf897 am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement. 
* commit 'd9f9da396b41f394991f676bc74dcfc59c7070a8':
  Improve text rendering and measurement.
 2014-02-10 19:56:58 +00:00
Deepanshu Gupta
d9f9da396b am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement. 
* commit '56b86debcfaf8f661011702d31854bb3804f5fe1':
  Improve text rendering and measurement.
 2014-02-10 19:53:48 +00:00
Deepanshu Gupta
56b86debcf am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement. 
* commit '1c91b1f7a2da5e5b1996217228399ef958c2be0c':
  Improve text rendering and measurement.
 2014-02-10 19:50:58 +00:00
Deepanshu Gupta
1c91b1f7a2 am 45dbfcc7: Improve text rendering and measurement. 
* commit '45dbfcc781a3926d22571b6ccfa3f27ec896f119':
  Improve text rendering and measurement.
 2014-02-10 19:47:20 +00:00
Derek Sollenberger
eef1be1d83 Merge "Removing SkiaColorFilter and inspecting the native object directly." 2014-02-10 19:19:07 +00:00
Chris Craik
4292e36f02 Merge "Add shadow casting / global perspective APIs, hidden for now." 2014-02-10 18:58:54 +00:00
Griff Hazen
9b4ee2f334 am edb555ed: am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev 
* commit 'edb555edceaf51f7ef40e35257a4b00c06a68e72':
  Fix ActivityView layout bug.
 2014-02-10 18:01:27 +00:00
Griff Hazen
edb555edce am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev 
* commit '92ade49ecaa23cd77510ee0bc1dbc6355eb581ed':
  Fix ActivityView layout bug.
 2014-02-10 17:54:57 +00:00
Griff Hazen
92ade49eca Merge "Fix ActivityView layout bug." into klp-modular-dev 2014-02-10 17:51:36 +00:00
Ricardo Cervera
1a73859489 am a11ac26b: am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 
* commit 'a11ac26b0e012eb9b9829afc74095a5cc6292452':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243
 2014-02-10 17:38:43 +00:00
Ricardo Cervera
a11ac26b0e am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 
* commit '9d6e456d777a147444da650e10ca9dfc1a64b9cd':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243
 2014-02-10 17:32:25 +00:00
Ricardo Cervera
9d6e456d77 am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 
* commit '332aefe931fe38291fa07fe20c9018eed1c8c0d5':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243
 2014-02-10 17:29:19 +00:00
Ricardo Cervera
332aefe931 am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 
* commit 'd038afd39874238357a5ca9621921542f57db7a1':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243
 2014-02-10 17:26:19 +00:00
Ricardo Cervera
d038afd398 am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 
* commit '7074f32440a8d6db4512c82e12b9e1c6891a4ce1':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243
 2014-02-10 17:22:23 +00:00
Ricardo Cervera
7074f32440 Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 2014-02-10 17:19:28 +00:00
Griff Hazen
af745f6df7 Fix ActivityView layout bug. 
Child TextureView should be positioned at origin of ActivityView,
with matching width and height. Previously, a container's padding
would be applied twice for example.

Change-Id: Ie0be10614a45aede4207abf986721385d04d8c76
 2014-02-10 08:58:32 -08:00
Narayan Kamath
9edcb7c908 Merge "Extended locales in AAPT / AssetManager." 2014-02-10 16:51:39 +00:00
Narayan Kamath
62cfa91f0d Merge "AssetManager support for 3 letter lang/country codes." 2014-02-10 16:51:30 +00:00
Narayan Kamath
91447d88f2 Extended locales in AAPT / AssetManager. 
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.

This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.

This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.

Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.

Change-Id: I899a56a9a182ee6be52b9389d1ae59266f5482e9
 2014-02-10 15:50:16 +00:00
Narayan Kamath
378c6775a6 AssetManager support for 3 letter lang/country codes. 
- 3 letter codes are packed into the existing 32 bit locale
  field in ResTable_config
- We introduce new fields for script / variant information.

Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.

Change-Id: I3c2e909ebbebdbbd0ab72a639d531b2b9fdbd9b9
 2014-02-10 15:33:30 +00:00
Narayan Kamath
f152d95085 am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code" 
* commit '33a608a0a326d9671bffd6750cb5521d6687cc57':
  AArch64: Use long for pointers in RS Java/JNI code
 2014-02-10 13:45:15 +00:00
Narayan Kamath
33a608a0a3 am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code" 
* commit '578d4f5f50b3b8969125376d696e893dc355faa6':
  AArch64: Use long for pointers in RS Java/JNI code
 2014-02-10 13:39:39 +00:00
Narayan Kamath
578d4f5f50 am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code" 
* commit '56062983f1e07295c812fba0e22ce579a35b6f76':
  AArch64: Use long for pointers in RS Java/JNI code
 2014-02-10 05:37:18 -08:00
Narayan Kamath
56062983f1 Merge "AArch64: Use long for pointers in RS Java/JNI code" 2014-02-10 13:33:26 +00:00
Katie McCormick
dd99d87a12 am ffc641dd: am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs 
* commit 'ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3':
  Doc update: misc GCM fixes
 2014-02-10 13:16:42 +00:00
Dirk Dougherty
7dd9c23778 am 91bdc7d4: am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 
* commit '91bdc7d4bed9e98db0a8d079a993cf90538e2a66':
  Doc change: add carousel and spotlight for developer video.
 2014-02-10 13:16:38 +00:00
Craig Mautner
e666350e12 am e03ed510: am 4e5b67e6: Queue startActivity params if not yet ready. 
* commit 'e03ed51068bcb4253e2fd2a4a3f39a7e580a721a':
  Queue startActivity params if not yet ready.
 2014-02-10 12:51:24 +00:00
Craig Mautner
56aa06c424 am 779d204a: am 9ef471f7: Don\'t remove Activities and Tasks until animation done 
* commit '779d204abe6a3922b572822df5cd775ffd5d77e8':
  Don't remove Activities and Tasks until animation done
 2014-02-10 12:51:19 +00:00
Christopher Tate
d8efad825d am 88daefd4: am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app" 
* commit '88daefd40767695f7e8a67d1d52dfaac2ab6bdb6':
  Use canonical path for /vendor/app
 2014-02-10 12:51:15 +00:00
John Spurlock
406b5f074e am cd4cf932: am 6691bfd6: am cccae25f: Merge "Example controller app for system ui demo mode." 
* commit 'cd4cf932d994c392ca6da21dc32a26d6d467b721':
  Example controller app for system ui demo mode.
 2014-02-10 12:51:06 +00:00
Jean-Luc Brouillet
774220fa0b am ecc8ee64: am 8067c9ec: am 11e6cabc: Merge "Fix a typo." 
* commit 'ecc8ee649578c2bb859c639c361d5a24005b9200':
  Fix a typo.
 2014-02-10 12:51:01 +00:00
Dan Sandler
694a022cb6 am 9e07c1c4: am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()" 
* commit '9e07c1c4f333171bff6e1cf1c4408e5738bcf127':
  Make sure to turn off led after pulse()
 2014-02-10 12:50:24 +00:00
Colin Cross
d06969518b frameworks/base: fix errors inside ALOGV 
Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc
 2014-02-09 21:54:01 -08:00
Katie McCormick
ffc641dd54 am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs 
* commit '6366dcbd494afe20912a932bb18faf199e4a1c62':
  Doc update: misc GCM fixes
 2014-02-08 18:44:52 +00:00
Dirk Dougherty
91bdc7d4be am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 
* commit '3333166738ca1382307bcf61e30adba6bdec83d4':
  Doc change: add carousel and spotlight for developer video.
 2014-02-08 18:44:49 +00:00
Katie McCormick
6366dcbd49 am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs 
* commit 'bcc27903fb4b9581f2b6912d767cccb2d1c2e1ba':
  Doc update: misc GCM fixes
 2014-02-08 18:39:07 +00:00
Dirk Dougherty
3333166738 am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 
* commit '3f43b646294857ea2dbd5e2fba944ee0d4c19657':
  Doc change: add carousel and spotlight for developer video.
 2014-02-08 18:39:01 +00:00
Katie McCormick
bcc27903fb am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs 
* commit '44085b68add3d7583f7832c51409de83655fc4f1':
  Doc update: misc GCM fixes
 2014-02-08 18:34:54 +00:00
Dirk Dougherty
3f43b64629 am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 
* commit '7fd4d29e847984c02561c7f385bfe0947432012e':
  Doc change: add carousel and spotlight for developer video.
 2014-02-08 18:34:44 +00:00