Wale Ogunwale
dc9cfca801
Merge "Prevent system uid component from running in an app process" into klp-dev
2015-07-01 16:06:34 +00:00
Amit Mahajan
8363104782
am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '22766e85d8b7bbedaa28a409f34120c4f3d4a2d3':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 20:00:00 +00:00
Joe Fernandez
f1686ac225
am 88c2d704: 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 '88c2d704c3bbb58a676b4b1164b1c98aecdf467d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 19:59:53 +00:00
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
5b8976a5ea
am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '853c61788387c38c1103f26b1c8c028da5676776':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:19:29 +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
Amit Mahajan
90224355cd
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:27 +00:00
Wale Ogunwale
78a22fd273
Prevent system uid component from running in an app process
...
Bug: 21669445
Change-Id: I792c6e676d4b6d54a51228d264130b8125075d98
2015-06-25 09:29:58 -07:00
Wale Ogunwale
dd673a63a6
Prevent system uid component from running in an app process
...
Bug: 21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit 44368567f840e3469b5fd2c9399ed444b6f46ebf)
2015-06-24 22:02:05 +00:00
Wale Ogunwale
5a487696e2
Prevent system uid component from running in an app process
...
Bug: 21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit 44368567f840e3469b5fd2c9399ed444b6f46ebf)
2015-06-24 22:01:15 +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
Diego Perez
5e50e00c66
Merge "Fix for shadows on theme editor" into lmp-mr1-dev
2015-06-15 08:35:00 +00:00
Diego Perez
ead59b0d47
Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
2015-06-15 08:34:04 +00:00
Diego Perez
ce4a9d9110
Merge "New custom widgets library" into lmp-mr1-dev
2015-06-12 14:34:50 +00:00
Diego Perez
f5a99437bf
Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
2015-06-12 14:34:09 +00:00
Leon Scroggins III
e899576f17
am 48b38452: 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 '48b38452b0454a1398d01a5df9fe949e2febdeef':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
2015-06-10 15:51:45 +00:00
Leon Scroggins III
6b16398dd1
am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
...
* commit '604ae32bcc6791da813a8e594783b695131bf888':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
2015-06-10 15:51:38 +00:00
Svetoslav
07264d936d
am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
...
* commit '18fb1c92d8c6ac732b85d7dee02a75591aec154b':
DO NOT MERGE Don't take flags when creating app widget config activity.
2015-06-10 15:51:38 +00:00
Justin Harrison
127d0b8065
Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev
2015-06-03 19:20:45 +00:00
Justin Harrison
aa9a679b00
Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
...
This reverts commit c48c31394e7e5dc104d22644d0e4e4a6a607497a.
Change-Id: Ia2b59da5d953a8a692c0e2f5eabb12e952dbdea1
2015-06-03 19:18:30 +00:00
Justin Harrison
29b9888467
Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev
2015-06-03 19:18:06 +00:00
Justin Harrison
c48c31394e
Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
...
This reverts commit afd883f8a3ee260a5505f83d628c0b789871c837.
Change-Id: Ia4fadbbc7e531d13cd9e9019f0cdb30cc090cb7a
2015-06-03 18:48:19 +00:00
Diego Perez
4362443cd9
Render to measured size when using expand mode
...
When using RenderingMode.V_SCROLL or RenderingMode.H_SCROLL, if the
screen size is smaller than the measured size but as large as the
desired size, the layout will render incorrectly and won't expand.
This changes that to expand to at least the size of the screen.
Added tests for the V_SCROLL and H_SCROLL modes.
Bug: http://b.android.com/174928
Change-Id: I22686903560775e2e4f362af1d7b50c9b985467d
2015-06-02 17:09:45 +01: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
Diego Perez
e5be1d7a39
Fix for shadows on theme editor
...
If the preferred ColorModel doesn't support alpha, the shadows are
incorrectly rendered. In the theme editor on Linux, the graphics device
object doesn't support alpha so we need to use a different color model.
We default to ARGB which works fine.
Change-Id: I3e71e3d086fa4975a9149d36792e574813f37dfd
2015-06-02 11:14:53 +01: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
958a7c1cd8
am 3d3e3bb4: 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 '3d3e3bb445dbd1775cdcab0ac19563400ac2d60a':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 17:18:54 +00:00
Leon Scroggins III
b6e3f930c1
am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
...
* commit '2bbcc253254a497b8f9bb86712fb6f0f2548e9f2':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 17:18:47 +00: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