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

156010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
22766e85d8 am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'bcf9223b3bbe542d0ab040398c26cf1c600f5493':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 19:45:08 +00:00
Joe Fernandez
88c2d704c3 am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '4bd25634f13876e7ab31b6de66ceb9ca1cdc784d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 19:45:03 +00:00
Amit Mahajan
bcf9223b3b am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '23444e76d2480d2537c2b6418f0c6c89c8cdb590':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 18:21:50 +00:00
Joe Fernandez
4bd25634f1 am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '765255b41229553842da855b8e5d9dfa87cf8e2b':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 18:21:41 +00:00
Amit Mahajan
23444e76d2 am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'eee86342713a7c89c30933a22f8b7e190d3af10f':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:31:49 +00:00
Amit Mahajan
eee8634271 am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '9edf7ad563ead119698ac3106b699515bd160ffe':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:14:24 +00:00
Amit Mahajan
853c617883 am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '791dd2c67466d2d9dafe58b1258e7718e3f30bc0':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:03:46 +00:00
Amit Mahajan
791dd2c674 DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
 2015-06-26 17:33:37 +00:00
Amit Mahajan
9edf7ad563 DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
 2015-06-26 17:33:32 +00:00
Joe Fernandez
765255b412 am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '6f8dab04572c772decef9b7ec5380f8e240a51ce':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-19 23:01:45 +00:00
Joe Fernandez
6f8dab0457 Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 2015-06-19 22:49:29 +00:00
Leon Scroggins III
48b38452b0 am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit 'a6932472d976c63a6b3970aac3607c4fe3a790b9':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-02 13:41:50 +00:00
Leon Scroggins III
a6932472d9 am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '5b751c80070a6c790fd386808be2a4258e37e69a':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-02 13:29:02 +00:00
Leon Scroggins III
5b751c8007 am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '7496e153f4308b39df9c53615770f44f593c3504':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-02 13:12:12 +00:00
Leon Scroggins III
604ae32bcc am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '4dae8e41b530672030731ec7cb69369da645cf30':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-02 13:01:13 +00:00
Leon Scroggins III
7496e153f4 am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '0d2081734ce124191ac1f3e8585336daa414abbe':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-02 12:59:29 +00:00
Leon Scroggins III
4dae8e41b5 Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 2015-06-02 12:48:43 +00:00
Svetoslav
18fb1c92d8 am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit 'bf0652eeea280bb1d687fe2fc3e869e0f6e9a541':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-01 23:02:37 +00:00
Svetoslav
bf0652eeea DO NOT MERGE Don't take flags when creating app widget config activity. 
bug:19618745

Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
 2015-06-01 12:55:38 -07:00
Leon Scroggins III
6549eed89e DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
bug: 20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
 2015-05-29 20:14:58 +00:00
Leon Scroggins III
0d2081734c DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
bug: 20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
 2015-05-29 16:13:11 -04:00
Leon Scroggins III
3d3e3bb445 am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE 
* commit 'c7a558fe73631e438061c31a54861594f0eb024f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 15:22:45 +00:00
Leon Scroggins III
c7a558fe73 am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE 
* commit '425d7c8713679ce9799139f7f91c6a45caa3b486':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 15:10:30 +00:00
Leon Scroggins III
425d7c8713 am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE 
* commit '11297581667128d2568a47ee03acab5c4f9f2784':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 14:53:00 +00:00
Leon Scroggins III
2bbcc25325 am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 
* commit 'b36ace7401c0e198ceddd2fdb908346b7bb5928f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 14:39:21 +00:00
Leon Scroggins III
1129758166 am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE 
* commit '18d7926709451b9e767731f46778e4238fc8e3b5':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 14:37:18 +00:00
Leon Scroggins III
b36ace7401 Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 2015-05-27 14:29:31 +00:00
Wale Ogunwale
523a19bf3d am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit 'c9a0c0b90773fded6c251646300231f67c891b78':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 04:50:11 +00:00
Leon Scroggins III
5cfd16201f Check that the parcel contained the expected amount of region data. DO NOT MERGE 
bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
 2015-05-26 21:09:24 +00:00
Leon Scroggins III
18d7926709 Check that the parcel contained the expected amount of region data. DO NOT MERGE 
bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
 2015-05-26 17:05:22 -04:00
Wale Ogunwale
c9a0c0b907 Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* Applications must now have ...permission.REAL_GET_TASKS to
be able to get process information for all applications.
* Only the process information for the calling application will be
returned if the app doesn't have the permission.
* Privilages apps will temporarily be able to get process information
for all applications if they don't have the new permission, but have
deprecated ...permission.GET_TASKS.

Bug: 20034603
Change-Id: I67ae9491f65d2280adb6a81593693d499714a216
(cherry picked from commit 9dbaa54f6834e013a63f18bd51ace554de811d80)
 2015-05-26 17:49:04 +00:00
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