Dirk Dougherty
8e9fdc124a
am a6eca103: am a38d97ca: am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit 'a6eca103b1d7c101343284d6f33fbf816cdeff92':
Doc change: misc fixes for preview 3.
2015-08-17 20:25:57 +00:00
Dirk Dougherty
a6eca103b1
am a38d97ca: am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit 'a38d97ca8aac6c830fbbfd890560d8a971eebea1':
Doc change: misc fixes for preview 3.
2015-08-17 20:18:49 +00:00
Bryce Lee
9600b7fb40
am de243eb2: am 55d39ecb: am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
...
* commit 'de243eb290c194b2204a27c0276bae5cd024797d':
Introduce permission for updating the cell broadcast content provider.
2015-08-17 20:16:27 +00:00
Dirk Dougherty
a38d97ca8a
am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit '76342acf89cf19b42a3671ea48b2f0264c0ce484':
Doc change: misc fixes for preview 3.
2015-08-17 20:11:02 +00:00
Bryce Lee
de243eb290
am 55d39ecb: am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
...
* commit '55d39ecb55052641db98566b5323c0af2b476990':
Introduce permission for updating the cell broadcast content provider.
2015-08-17 20:08:19 +00:00
Dirk Dougherty
76342acf89
am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit 'ed257d1a3c7d94980e6fc1524a8e85f4e1d3959a':
Doc change: misc fixes for preview 3.
2015-08-17 20:03:59 +00:00
Bryce Lee
55d39ecb55
am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
...
* commit 'd74a66bd97ed52fc985e9fa145072a9fc4e0a3e3':
Introduce permission for updating the cell broadcast content provider.
2015-08-17 20:01:51 +00:00
Dirk Dougherty
ed257d1a3c
am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit 'bd58d6fcadad111cee35778a4f77c4f789a0f8c6':
Doc change: misc fixes for preview 3.
2015-08-17 19:56:28 +00:00
Bryce Lee
d74a66bd97
Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
2015-08-17 19:54:19 +00:00
Junda Liu
448e082850
am e7194f99: am 9ddc014d: am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit 'e7194f9954866fafcaeb2089bee62f0e550d02d7':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:36:55 +00:00
Dirk Dougherty
bd58d6fcad
Doc change: misc fixes for preview 3.
...
Change-Id: Ib389f3db0e38f13d2634fda9e893c1dd87dcd6fc
2015-08-17 12:27:34 -07:00
Junda Liu
e7194f9954
am 9ddc014d: am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit '9ddc014da24a74ea7ac6b2816521cb60e9059306':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:26:55 +00:00
Chris Tate
cb114835f8
am df1fffe2: am 498cf7ac: am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit 'df1fffe20d8955d388110ae4ed57681e85d233b7':
Check component permissions like 'exported' before assigned permissions
2015-08-17 19:26:55 +00:00
Quddus Chong
dc8c0be50a
am d87a21b5: am 433ecac9: am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit 'd87a21b58229d5da347b3bab44045430a33d5edb':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 19:20:30 +00:00
Junda Liu
9ddc014da2
am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit '88c4e40636e2d2022b7afdacccb4de0d07d7703f':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:20:10 +00:00
Chris Tate
df1fffe20d
am 498cf7ac: am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit '498cf7ac937fda7e766fe96547a71f129f4cccb0':
Check component permissions like 'exported' before assigned permissions
2015-08-17 19:18:21 +00:00
Quddus Chong
d87a21b582
am 433ecac9: am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit '433ecac90389abd3c5762232c3d6f7c0a4c3d03c':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 19:12:54 +00:00
Chris Tate
498cf7ac93
am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit 'a0d4c9758c3dc06b29c61a2f023599a83aea8268':
Check component permissions like 'exported' before assigned permissions
2015-08-17 19:11:40 +00:00
Junda Liu
88c4e40636
am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit '150123a37445dc778c30a466b6a69f575007c76d':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:11:24 +00:00
Andrew Solovay
a50c80c23e
am e03ca16d: am 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
...
* commit 'e03ca16d1bf71ba453126bbd6d5ee8c5cb6a46e8':
docs: Updating the permissions docs for Preview 3.
2015-08-17 19:07:25 +00:00
Junda Liu
150123a374
am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit 'f2cb6f7e3ea143ba4acace0821c9d49e363da7eb':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:03:58 +00:00
Quddus Chong
433ecac903
am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit '101059b723ff03684fff89898bd5b046af320a16':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 19:03:51 +00:00
Chris Tate
a0d4c9758c
am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit '1a31af15c14ddc241e6e0633be337f81dea20ad5':
Check component permissions like 'exported' before assigned permissions
2015-08-17 19:01:52 +00:00
Junda Liu
f2cb6f7e3e
Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
2015-08-17 18:58:19 +00:00
Quddus Chong
101059b723
am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit 'aefae50d5e4d81601d52dce47e9be6e56834ccf3':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 18:56:40 +00:00
Chris Tate
1a31af15c1
am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit 'a3fd27adcc655dd9566d72f290ac343704e8e4db':
Check component permissions like 'exported' before assigned permissions
2015-08-17 18:55:24 +00:00
Andrew Solovay
e03ca16d1b
am 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
...
* commit '8552b77c6f68d67f7bf55d3f8c10039a8e9ca4fb':
docs: Updating the permissions docs for Preview 3.
2015-08-17 18:55:04 +00:00
Quddus Chong
aefae50d5e
am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit 'a03567bfe0b2f71263e5facd0edc908bf43965cc':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 18:47:52 +00:00
Xiyuan Xia
4d25a1d914
Merge "Add full screen user switcher to lock screen"
2015-08-17 18:47:38 +00:00
Ruben Brunk
cbb6c16fe6
am 6f4f94ae: am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev
...
* commit '6f4f94ae60129be8052ae3b1c4fd9b83a4729073':
Add experimental camera session prepare API.
2015-08-17 18:01:20 +00:00
Chris Tate
a3fd27adcc
Merge "Check component permissions like 'exported' before assigned permissions" into mnc-dev
2015-08-17 18:01:15 +00:00
Andrew Solovay
8552b77c6f
am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
...
* commit 'f377bffb30c78aaa5dd4188400a018a9febc2afd':
docs: Updating the permissions docs for Preview 3.
2015-08-17 17:54:30 +00:00
Quddus Chong
a03567bfe0
docs: Fixed unclosed anchor tag for M Program Overview.
...
Change-Id: I632e999c0d32acbf5c5fce5377603069fea312f0
2015-08-17 10:53:10 -07:00
Ruben Brunk
6f4f94ae60
am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev
...
* commit '305680d6a08f6b44d71d7c83aebc557cfcbd3f85':
Add experimental camera session prepare API.
2015-08-17 17:51:42 +00:00
Andrew Solovay
f377bffb30
am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
...
* commit 'a8f68d2da7733673d25fd1e5573539bf29b71ee4':
docs: Updating the permissions docs for Preview 3.
2015-08-17 17:45:46 +00:00
Ruben Brunk
305680d6a0
am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev
...
* commit '3723af531a2e5d9e90097460167d98cf8fc9975f':
Add experimental camera session prepare API.
2015-08-17 17:44:36 +00:00
Ruben Brunk
3723af531a
am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev
...
* commit 'c57f309a1b5be6fe9156405feb48637c036880a4':
Add experimental camera session prepare API.
2015-08-17 17:37:16 +00:00
Andrew Solovay
a8f68d2da7
am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
...
* commit 'af46e1b404c1d4fea17a24e5a49f23a7d0c982f7':
docs: Updating the permissions docs for Preview 3.
2015-08-17 17:35:05 +00:00
Ruben Brunk
c57f309a1b
Merge "Add experimental camera session prepare API." into mnc-dr-dev
2015-08-17 17:28:12 +00:00
Christopher Tate
ff7add011a
Check component permissions like 'exported' before assigned permissions
...
In particular, don't assume that the absence of an explicit permission
requirement means that the activity is freely launchable unless you have
also checked thing like exported="true" first.
Bug 23223804
Change-Id: Idbfd1f5662b374a7a447b738591b267a1c497e41
2015-08-17 10:25:27 -07:00
Derek Sollenberger
deead00082
Merge "Add ninePatch support to Canvas.h"
2015-08-17 17:20:55 +00:00
Chris Wren
b247ba1ff5
am c1acc1df: am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev
...
* commit 'c1acc1dfcea07cd9d78090c2aa90e93f91104729':
instrument fingerprint service
2015-08-17 17:16:15 +00:00
Chris Wren
c1acc1dfce
am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev
...
* commit '5b37c0d88c079f49602ff0bef5338e547658ef96':
instrument fingerprint service
2015-08-17 17:09:52 +00:00
Andrew Solovay
af46e1b404
resolved conflicts for merge of 44053b4e to mnc-dev
...
Change-Id: Ibe58da3f0b18bce138b9d8880bccfe61ebc0b2cf
2015-08-17 10:06:26 -07:00
Chris Wren
5b37c0d88c
am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev
...
* commit '2299478362bfb5c0608dad083371b404124d9c89':
instrument fingerprint service
2015-08-17 17:02:03 +00:00
Chris Wren
2299478362
am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev
...
* commit '877c22579e18736ee77d106ee2419ae99203bc9b':
instrument fingerprint service
2015-08-17 16:52:29 +00:00
Alan Viverette
abd89024ac
Merge "Manage accessibility focus during PhoneWindow save and restore"
2015-08-17 16:51:44 +00:00
Chris Wren
877c22579e
Merge "instrument fingerprint service" into mnc-dr-dev
2015-08-17 16:47:55 +00:00
Chris Craik
31710114ba
Merge "Make the value for shadowRadius less than 1.0 work"
2015-08-17 16:37:36 +00:00
Quddus Chong
3de880f838
am 58e2e14a: am 8f00f747: am 3449530c: am ee222a7f: am ed7961eb: Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev
...
* commit '58e2e14a52cc4c25fce62f43ce5daf0dda557f9b':
docs: Fixed typo in Android for Work section in MNC Behavior Changes doc.
2015-08-17 16:36:08 +00:00