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

119580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
7b5d0a82f6 am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'c139177b13427ea3ea1bc88364136439125848af':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:55:41 +00:00
Deepanshu Gupta
c139177b13 am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '65521c3cf169808cd02ce09a7344bc633d51c1fc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:53:17 +00:00
Deepanshu Gupta
65521c3cf1 am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'ca4b9a77e7d20703287b33b203b2582bd43f7792':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:49:27 +00:00
Justin Koh
7206ac5612 am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev 
* commit 'a79ac472d71de6d13f3561012ca0e870bd9fe04b':
  Add hardware feature describing a watch.
 2014-02-20 17:48:00 +00:00
Deepanshu Gupta
ca4b9a77e7 am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'e92c8542a5cf1160a1b701b9f176af64ba46d68d':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:46:02 +00:00
Deepanshu Gupta
e92c8542a5 am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '01825b7aa3c864426c78c08c2f6004a8362c2b47':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:42:54 +00:00
Justin Koh
a79ac472d7 am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev 
* commit '744d3473f8a0f9f95e3fdf83670faf6d1551839e':
  Add hardware feature describing a watch.
 2014-02-20 17:41:31 +00:00
Justin Koh
744d3473f8 Merge "Add hardware feature describing a watch." into klp-modular-dev 2014-02-20 17:38:03 +00:00
Narayan Kamath
66e30b357d am c95ed621: am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." 
* commit 'c95ed62111e0b8aceda4322011ad019c28987cbc':
  Fix several bad function definitions.
 2014-02-20 13:04:40 +00:00
Narayan Kamath
fb7b3181fc am 520a5673: am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit '520a5673fbe8bff90954045b24a361982861ef8d':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-02-20 13:04:37 +00:00
Narayan Kamath
c95ed62111 am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." 
* commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2':
  Fix several bad function definitions.
 2014-02-20 13:02:25 +00:00
Narayan Kamath
520a5673fb am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-02-20 13:02:21 +00:00
Narayan Kamath
fca204a4b8 am 05cebdc2: Merge "Fix several bad function definitions." 
* commit '05cebdc2abd05b0dca351306cb039245d50c67ae':
  Fix several bad function definitions.
 2014-02-20 04:58:52 -08:00
Narayan Kamath
b152473f46 am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit '9fce8535851fc696997bd3c251d00e34179d6482':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-02-20 04:58:45 -08:00
Narayan Kamath
05cebdc2ab Merge "Fix several bad function definitions." 2014-02-20 12:55:27 +00:00
Narayan Kamath
9fce853585 Merge "AArch64: Make AssetAtlasService 64-bit compatible" 2014-02-20 12:55:20 +00:00
Narayan Kamath
047b938f71 Fix several bad function definitions. 
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271

(cherry picked from 017546e65280a3389b6167f5fc3b5d1c3001154a)

Change-Id: Iede02be90e6a3c9a2db1fe04dcd0db99abe37097
 2014-02-20 12:52:16 +00:00
Ashok Bhat
4de3f481bc AArch64: Make AssetAtlasService 64-bit compatible 
Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
    AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: Ib4c77c134e3ad5b21732e20cde9a54a0b16bdab1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-20 12:10:24 +00:00
Narayan Kamath
bcb433b43a am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit 'b1903653e4177a9394d7c30e3834fc8469485325':
  libandroidfw: fix build error for 64-bit
 2014-02-20 11:59:46 +00:00
Narayan Kamath
b1903653e4 am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit '128599e4496bd7ceb9d70f4addde0eba65103709':
  libandroidfw: fix build error for 64-bit
 2014-02-20 11:57:19 +00:00
Narayan Kamath
128599e449 am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit '2b3c14bf75c71524a0fcbc3e9d1fdab9aa6c3473':
  libandroidfw: fix build error for 64-bit
 2014-02-20 03:53:36 -08:00
Narayan Kamath
2b3c14bf75 Merge "libandroidfw: fix build error for 64-bit" 2014-02-20 11:50:59 +00:00
Patrik Bannura
443dd9313f libandroidfw: fix build error for 64-bit 
Fixed casting int to pointer in logging code.
Previously ints where printed as pointers and
the %p format specifier was used for convenience
to get hex output. This change uses %x and also
gets rid of the casts.

Change-Id: Ia2539769d245f50c0f3884119f80682defe69d61
 2014-02-20 10:06:23 +00:00
Scott Main
5ef8d14d38 am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '72eff55b2c54446bda219d0b32c7355b0ccf83a0':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:29:08 +00:00
Scott Main
72eff55b2c am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit 'd43ad2f35abcc647f7985abd09ed9de5899faf18':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:25:57 +00:00
Scott Main
d43ad2f35a am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '4c68c4ed463f7f83d05f86ed11046195829028ed':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:23:52 +00:00
Scott Main
4c68c4ed46 am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '24a8e1d0e9a32c571403bfc730ce18dd138a529c':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:20:30 +00:00
Scott Main
24a8e1d0e9 am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit 'af87e19bdbf6b16240dcdbfd31fe4f33eca4e51d':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:17:20 +00:00
Scott Main
af87e19bdb Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 2014-02-20 02:14:40 +00:00
Scott Main
8ad4275640 update intent examples for maps 
bug: 12661490
bug: 12957723

Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
 2014-02-19 18:08:33 -08:00
Deepanshu Gupta
01825b7aa3 Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
For these font families, text was always rendered as italic. This
changeset fixes the issue.

Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)
 2014-02-19 20:17:47 +00:00
Adam Lesinski
13c839962e am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev 
* commit '1c532c2e2d8464ef7ddd0cc5914f3b1ab2dc49c2':
  Make UsbService optional
 2014-02-19 19:44:19 +00:00
Adam Lesinski
0817d16c53 am 04520a01: am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev 
* commit '04520a01b8469729379e73a7995a188ffea2b187':
  Add fastpath for single signature comparison
 2014-02-19 19:44:17 +00:00
Adam Lesinski
1c532c2e2d am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev 
* commit '4b07b26e8654df52ca80bb2165ebdf9352ab9337':
  Make UsbService optional
 2014-02-19 19:41:26 +00:00
Adam Lesinski
04520a01b8 am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev 
* commit '6feaa267a585f22595f846c9e3d09a76dc3db47a':
  Add fastpath for single signature comparison
 2014-02-19 19:41:23 +00:00
Adam Lesinski
4b07b26e86 Merge "Make UsbService optional" into klp-modular-dev 2014-02-19 19:38:34 +00:00
Adam Lesinski
6feaa267a5 Merge "Add fastpath for single signature comparison" into klp-modular-dev 2014-02-19 19:38:17 +00:00
Craig Mautner
6ed1c96b72 am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit 'a1baf0288407c17737cf92bba5c7fccb8c8c55ed':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 16:34:03 +00:00
Narayan Kamath
29596ac2ba am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '41dd75f8135cd50ba2d38690ce8b05f30964f6e7':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:34:01 +00:00
Craig Mautner
a1baf02884 am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '23ef1b5e0b84e3bb726454b97846f91f2efad212':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 16:29:01 +00:00
Narayan Kamath
41dd75f813 am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '96ddea413dcf266d996877d3fc2d81738c5316c8':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:28:56 +00:00
Craig Mautner
23ef1b5e0b am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '16ea3e6a5b37dc436d1089996004bcae12f5e3b0':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 08:26:15 -08:00
Narayan Kamath
96ddea413d am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '7c710936c5129664f8b23bf4592c12eca975d229':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 08:26:07 -08:00
Craig Mautner
16ea3e6a5b Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 2014-02-19 15:36:01 +00:00
Narayan Kamath
7c710936c5 Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 2014-02-19 14:24:48 +00:00
John Spurlock
14833719e1 am 01573b50: am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '01573b5011e777405ba7467678c3083cd03f6968':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:57:21 +00:00
John Spurlock
01573b5011 am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '469301f7edf2201fdbac217fb0ae49652fa9466c':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:54:13 +00:00
John Spurlock
469301f7ed am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '9dd87081e4bea9cd48db35fa82b3adeda37a34b5':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:51:00 +00:00
John Spurlock
9dd87081e4 am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '998735652d2449e3ccbac7686b71bf40dca06e94':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:47:52 +00:00
John Spurlock
998735652d am ba231fca: Fix bad @links in PendingIntent.java 
* commit 'ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:44:14 +00:00