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

155978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leon Scroggins III
67326bcba0 am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'ea2dcda788e035ccdc55ab16303c9e34740a3f8c':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:41:49 +00:00
Leon Scroggins III
ea2dcda788 am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'ee35410ff8297b1ab39f3e546ebcedc27300a7de':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:29:22 +00:00
Leon Scroggins III
ee35410ff8 am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'a7501119e341626536ce12c3539c2f9a986a2945':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:20:02 +00:00
Leon Scroggins III
16ac8ad7fa am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '4a6ca6724c789603626d74a8cc187365788a6cfd':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:53:24 +00:00
Leon Scroggins III
a7501119e3 am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '69b8e962e1b8346b33a2c14889547a0ac00c8b17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:48:12 +00:00
Leon Scroggins III
4a6ca6724c Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6

BUG=19666945

Change-Id: Iab0d218c41ae0c39606e333e44cda078eef32291
 2015-04-16 15:38:03 +00:00
Leon Scroggins III
69b8e962e1 Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6

BUG=19666945

Change-Id: I9490d90244e051a4019d6266b2a1cb375a65198f
 2015-04-15 08:16:29 -04:00
Deepanshu Gupta
17bb697b3b am ec8df9af: Fix tests for Java 6. 
* commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
  Fix tests for Java 6.
 2015-03-27 01:02:58 +00:00
Deepanshu Gupta
ec8df9af2f Fix tests for Java 6. 
- Change the guava version used to match the one included in the SDK.
   The test server uses the same. However, the command line build still
   uses the guava present at platform/external/guava, which is compiled
   with Java 7. Thus, running the tests from inside the IDE can be done
   via Java 6.
 - Rebuilt the test app classes with Java 6 compatibility.
 - Change similarity threshold to prevent differences due to some locale
   settings different java versions.

Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
 2015-03-26 12:29:36 -07:00
Michael Runge
96f47f5bf3 am b0197033: Increase timeout when uncrypting OTA 
* commit 'b019703395ae0304ddd10054843c64db87229d23':
  Increase timeout when uncrypting OTA
 2015-03-26 03:57:33 +00:00
Michael Runge
b019703395 Increase timeout when uncrypting OTA 
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit 01c06dfb076b71cb72c4bff9175bec9d59d2efde)
 2015-03-26 03:01:02 +00:00
Deepanshu Gupta
44b5a1c847 am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'e541f35055709ec43407649b8517639ff00e42d6':
  Update JRE for runConfigurations.
 2015-03-24 23:55:18 +00:00
Deepanshu Gupta
cbb4ec7867 am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '6f5fac817abee63d9211e8e43646196950c43707':
  Fix project settings. [DO NOT MERGE]
 2015-03-24 23:55:14 +00:00
Deepanshu Gupta
a16bb347e1 am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit '44fea60376e4e851b07eb365fd581c5b9404611f':
  Fix RoundRect radius.
 2015-03-24 23:55:10 +00:00
Deepanshu Gupta
8f9ebc6593 am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '3bd5cbb1f3d837d7799fb4b33b4dda99adbeeeb4':
  Use right colors for status bar and nav bar.
 2015-03-24 23:55:06 +00:00
Deepanshu Gupta
0b76cf6ff5 am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '34751c79d6696054b19b5fd0e2946c1dbe5bd9bd':
  Better shadows.
 2015-03-24 23:55:02 +00:00
Deepanshu Gupta
a62a18e341 am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '311a0f54ac95a1649474498748fff8327b0c917d':
  Fix layoutlib tests.
 2015-03-24 23:54:58 +00:00
Deepanshu Gupta
e541f35055 Merge "Update JRE for runConfigurations." into lmp-dev 2015-03-24 23:52:29 +00:00
Deepanshu Gupta
6f5fac817a Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 2015-03-24 23:52:18 +00:00
Deepanshu Gupta
44fea60376 Merge "Fix RoundRect radius." into lmp-dev 2015-03-24 23:51:50 +00:00
Deepanshu Gupta
3bd5cbb1f3 Merge "Use right colors for status bar and nav bar." into lmp-dev 2015-03-24 23:51:30 +00:00
Deepanshu Gupta
34751c79d6 Merge "Better shadows." into lmp-dev 2015-03-24 23:51:11 +00:00
Deepanshu Gupta
311a0f54ac Merge "Fix layoutlib tests." into lmp-dev 2015-03-24 23:50:54 +00:00
Deepanshu Gupta
00c2adf5db Better shadows. 
Better shadows for rectangles and rounded rectangles (includes circles).

The shadow painting code is mostly from CardView library, but modified
heavily since CardView needs to draw the shadow inside view bounds.

Change-Id: I88c9f19b1c16839b8d6db6df2bebff126fa5a9a3
 2015-03-24 14:06:49 -07:00
Deepanshu Gupta
7c834296ac Fix RoundRect radius. 
Android APIs use radius for measuring the corner's curvature, but Java2D
APIs use diameter. Add the missing conversion.

Change-Id: I630fc8712e8301324c641885c0c4adf644d13b7e
 2015-03-24 11:43:39 -07:00
Deepanshu Gupta
58ca246c83 Use right colors for status bar and nav bar. 
Bug: http://b.android.com/81862
Change-Id: Ia10297e83e54c01a50de6cbcac2b7fef48e8d238
 2015-03-22 11:03:44 -07:00
Zach Riggle
a6e7a9b50d am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController
 2015-03-19 23:15:02 +00:00
Zach Riggle
6a5b2110eb Merge "Fix NPE in FlashlightController" into lmp-dev 2015-03-19 23:09:33 +00:00
smain@google.com
3bc84b18b7 am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page
 2015-03-19 22:29:09 +00:00
smain@google.com
910ca41558 am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page
 2015-03-19 22:22:10 +00:00
smain@google.com
4b53dc8bae Merge "add Places API to the Location feature page" into lmp-docs 2015-03-19 22:16:12 +00:00
Joe Fernandez
b88bce219a am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'c773358d599d9dd7716db88b0699a7903d64ad9b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:28:54 +00:00
Joe Fernandez
f761e4c20e am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit 'd91167e8ceda64809e9afd73ac184dc319a276f5':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:28:45 +00:00
Joe Fernandez
36b2c1609d am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'bacdd2b8dec83679493a95bdcfa5ac80b6cfcb78':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:28:40 +00:00
Joe Fernandez
c773358d59 am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'dd461b298834d7582a98a69c164fe1e3b63c81b9':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:21:47 +00:00
Joe Fernandez
d91167e8ce am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit '80f947c8b41d732bc1f8ca4c36df11a395dc9248':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:21:43 +00:00
Joe Fernandez
bacdd2b8de am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:21:37 +00:00
Eric Gilmore
0fdeefbdad am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit 'cf1586d3fb4e3232aa4f4679eb389bcf89415b15':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:17:22 +00:00
Joe Fernandez
dd461b2988 Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 2015-03-19 20:16:32 +00:00
Joe Fernandez
80f947c8b4 Merge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 2015-03-19 20:16:21 +00:00
Joe Fernandez
ef7d80811d Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 2015-03-19 20:16:05 +00:00
Eric Gilmore
cf1586d3fb am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit 'e43a64e3336548094571885944afc28792e24fa0':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:10:55 +00:00
Eric Gilmore
e43a64e333 Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 2015-03-19 20:05:50 +00:00
Rich Slogar
b569ec3cc1 am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'd76aa14cf401ca794b585b2312528121c651a537':
  docs: proguard help update
 2015-03-19 19:39:27 +00:00
Rich Slogar
d76aa14cf4 am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'd58858427e102bec7ebe1d2a8ce418529924a68c':
  docs: proguard help update
 2015-03-19 19:10:06 +00:00
Rich Slogar
d58858427e Merge "docs: proguard help update" into lmp-docs 2015-03-19 19:04:05 +00:00
Rich Slogar
f062b94cc2 docs: proguard help update 
b/19383794
b/19417644

Change-Id: I454015fb85601dbd31d3cb364eaa6d0adee0c764
 2015-03-19 10:55:27 -07:00
Joe Fernandez
b8eea908c6 RESUBMIT: "Doc change: add docs for SafetyNet API."" 
This reverts commit 1fac8d4800c4cdd0c357b17ad0a271f8f3b4bee0.

Change-Id: Idf3dba195f3e0ccf27103b9f7d7a67cec8c917b0
 2015-03-19 16:39:43 +00:00
Joe Fernandez
61bfeafdef RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" 
This reverts commit 2a867108951807e467dbfe0fcd4cc48a4d7f4191.

Change-Id: Ib91bf437e952e8a91f20afc63332b88952527ca4
 2015-03-19 16:38:05 +00:00
Joe Fernandez
7786917f4a RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" 
This reverts commit c0e9ac455568b2d82d191388708a281bdb376cc9.

Change-Id: Iccc75ead90c92602b25da70e13bcdd55a6d129b6
 2015-03-19 16:36:02 +00:00