Lorenzo Colitti
8dbec94501
am 3dbb5836: am 71e3d079: Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev
...
* commit '3dbb583649afeecbd42122fbe1115d2974da021f':
Make the VPN notice connectivity changes on stacked interfaces.
2015-07-03 03:02:24 +00:00
Lorenzo Colitti
3dbb583649
am 71e3d079: Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev
...
* commit '71e3d079d623b93ec8a66afa6a1281896c7cd2c6':
Make the VPN notice connectivity changes on stacked interfaces.
2015-07-03 02:49:58 +00:00
Lorenzo Colitti
71e3d079d6
Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev
2015-07-03 02:37:46 +00:00
Svet Ganov
052385da41
am 8018e677: am 27997678: Merge "Grant the default gallery app storage permissions" into mnc-dev
...
* commit '8018e6770ad1260a481d933053ef4a84083613a1':
Grant the default gallery app storage permissions
2015-07-02 22:01:07 +00:00
Svetoslav
d87fc3e9a1
am fa656593: am 212bd428: Merge "Make granting default SMS and Phone permissions robust" into mnc-dev
...
* commit 'fa656593fae9ba3dea7f917da55a8667ddff5ad4':
Make granting default SMS and Phone permissions robust
2015-07-02 22:01:00 +00:00
Svet Ganov
8018e6770a
am 27997678: Merge "Grant the default gallery app storage permissions" into mnc-dev
...
* commit '2799767886cc230d554ec7e7e9c7596b3e311e13':
Grant the default gallery app storage permissions
2015-07-02 21:47:55 +00:00
Svetoslav
fa656593fa
am 212bd428: Merge "Make granting default SMS and Phone permissions robust" into mnc-dev
...
* commit '212bd4280de4d94efcd91e11c5169b6cf239d85a':
Make granting default SMS and Phone permissions robust
2015-07-02 21:47:49 +00:00
Svet Ganov
2799767886
Merge "Grant the default gallery app storage permissions" into mnc-dev
2015-07-02 21:37:58 +00:00
Svetoslav
212bd4280d
Merge "Make granting default SMS and Phone permissions robust" into mnc-dev
2015-07-02 21:37:33 +00:00
Anthony Lee
da83156c41
am c692c69e: am 930d6b07: Merge "Add capability to indicate a conference will never have children." into mnc-dev
...
* commit 'c692c69e8a330e6dc3ca5be0da4c320751846657':
Add capability to indicate a conference will never have children.
2015-07-02 19:00:09 +00:00
Anthony Lee
c692c69e8a
am 930d6b07: Merge "Add capability to indicate a conference will never have children." into mnc-dev
...
* commit '930d6b07e32bbb0f20d9ec4f19ff08d198fa9498':
Add capability to indicate a conference will never have children.
2015-07-02 18:48:48 +00:00
Anthony Lee
930d6b07e3
Merge "Add capability to indicate a conference will never have children." into mnc-dev
2015-07-02 18:33:53 +00:00
Rubin Xu
0dfa0e70c7
am 27f13d12: am b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev
...
* commit '27f13d125f9eb8053493086871fcb5470c786264':
Remove ExternalMediaFormatActivity
2015-07-02 16:46:57 +00:00
Rubin Xu
27f13d125f
am b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev
...
* commit 'b1f4cc647f94a24b7918315a21c114f20c644e0b':
Remove ExternalMediaFormatActivity
2015-07-02 16:31:17 +00:00
Rubin Xu
b1f4cc647f
Merge "Remove ExternalMediaFormatActivity" into mnc-dev
2015-07-02 16:22:46 +00:00
Rubin Xu
c85c639312
Remove ExternalMediaFormatActivity
...
This activity is no longer used by any part of the framework.
Bug: 9433509
Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2
2015-07-02 16:53:57 +01:00
Alex Chau
f584df1342
am 42a18bde: am be630760: Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev
...
* commit '42a18bdee018dd4ec411518e10c96d8a08decefd':
Clear "profile wiped" notification when a new porfile is created
2015-07-02 15:00:55 +00:00
Alex Chau
42a18bdee0
am be630760: Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev
...
* commit 'be6307606e71dd2a5ce483fa876ced268fd813bf':
Clear "profile wiped" notification when a new porfile is created
2015-07-02 14:47:25 +00:00
Alex Chau
be6307606e
Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev
2015-07-02 14:37:04 +00:00
Nicolas Prevot
7c73c23dc7
am 38d7050d: am 2ee3beed: Merge "In NfcActivityManager, don\'t use UserHandle.CURRENT." into mnc-dev
...
* commit '38d7050da1de1e0dd98f6f5cd3bca56bfa882247':
In NfcActivityManager, don't use UserHandle.CURRENT.
2015-07-02 12:54:16 +00:00
Nicolas Prevot
38d7050da1
am 2ee3beed: Merge "In NfcActivityManager, don\'t use UserHandle.CURRENT." into mnc-dev
...
* commit '2ee3beedb1f6702f4c94eff24c896cd4a894082b':
In NfcActivityManager, don't use UserHandle.CURRENT.
2015-07-02 12:44:02 +00:00
Nicolas Prevot
2ee3beedb1
Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev
2015-07-02 12:28:46 +00:00
Nicolas Prevot
b06aece751
am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev
...
* commit 'd16f1252e1e7924a95388a5479d7bb179279f04c':
Fix the case where an intent bounces several times between users.
2015-07-02 10:52:25 +00:00
Nicolas Prevot
d16f1252e1
am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev
...
* commit '60373e8060cf6de2d293a758c33cc5f610122657':
Fix the case where an intent bounces several times between users.
2015-07-02 10:39:46 +00:00
Nicolas Prevot
60373e8060
Merge "Fix the case where an intent bounces several times between users." into mnc-dev
2015-07-02 10:27:58 +00:00
Lorenzo Colitti
1b60d11b8f
Make the VPN notice connectivity changes on stacked interfaces.
...
Currently, the VPN code only looks at base interfaces, so if
464xlat is in use, it will never disconnect when its underlying
network has disconnected. Use getAllInterfaceNames().contains()
instead of just comparing the base interface name.
Bug: 19336810
Change-Id: Id1ba2c80a09cec5098c6f512acdc0a05a939e9f3
2015-07-02 13:03:03 +09:00
Svet Ganov
200d494b93
Grant the default gallery app storage permissions
...
bug:22127986
Change-Id: I1ecd49d57d410bf10734fea4e0c92e6e5028d648
2015-07-01 20:46:06 -07:00
David Friedman
c3ab1714ad
am b198cb02: am 00f0716a: am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs
...
* commit 'b198cb029e0227e886199a13e384675b175357e0':
Docs: Localization of Design pages on DAC. Bug: 20503708
2015-07-02 03:11:31 +00:00
David Friedman
cf69c308a6
am d89fbf4c: am 9ee2f2c9: am 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs
...
* commit 'd89fbf4c2d0a2602fbda635538e7414fbffac75f':
Docs: Fixes a terminology error in simplified Chinese on-boarding docs
2015-07-02 03:11:25 +00:00
Svetoslav
a5a0d94023
Make granting default SMS and Phone permissions robust
...
The default dialer and sms apps are provided by the telecomm
stak which is brought up asynchronously as a service to which
the system binds. Hence, by the time we grant default permissions
this service is not bound and we do not know the default dialer
(accidentally the default SMS app is available before the service
is up). Now the default permission grant code is robust to handle
both cases of the default sms and phone apps being available
at grant time or asynchronously.
bug:22208642
Change-Id: I6385a0432368731aa9caea046d57eccbfb5abac0
2015-07-01 20:00:32 -07:00
David Friedman
b198cb029e
am 00f0716a: am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs
...
* commit '00f0716a9521c668e0e42c36ee19a5f58e62f00f':
Docs: Localization of Design pages on DAC. Bug: 20503708
2015-07-02 02:57:41 +00:00
David Friedman
d89fbf4c2d
am 9ee2f2c9: am 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs
...
* commit '9ee2f2c90fb090e6055fa50428ae967ca750d236':
Docs: Fixes a terminology error in simplified Chinese on-boarding docs
2015-07-02 02:57:35 +00:00
Abodunrinwa Toki
e91d790814
am 7099e39f: am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev
...
* commit '7099e39f142ff67327ae1a242039fc5f98b76717':
Add accessibility actions for the PROCESS_TEXT feature.
2015-07-02 02:51:33 +00:00
David Friedman
00f0716a95
am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs
...
* commit '2ebfc3f78483842c789688da47b721f60b4149e4':
Docs: Localization of Design pages on DAC. Bug: 20503708
2015-07-02 02:45:30 +00:00
David Friedman
9ee2f2c90f
am 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs
...
* commit '5adc6ba056de056f73ee484b859b45657da0c1fb':
Docs: Fixes a terminology error in simplified Chinese on-boarding docs
2015-07-02 02:45:24 +00:00
Wale Ogunwale
60dab2c4e4
am ee548960: am b29d573d: am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
...
* commit 'ee5489606e85d3baae5dba4aeef125cd00fd3dec':
Prevent system uid component from running in an app process
2015-07-02 02:39:23 +00:00
Abodunrinwa Toki
7099e39f14
am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev
...
* commit '8fbe1a0cfc0354067c10e5e788519c19f4b39349':
Add accessibility actions for the PROCESS_TEXT feature.
2015-07-02 02:38:52 +00:00
David Friedman
2ebfc3f784
am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs
...
* commit 'fa8eb1e0d42e7b10447a285d9b2a583d367c3cad':
Docs: Localization of Design pages on DAC. Bug: 20503708
2015-07-02 02:33:03 +00:00
David Friedman
5adc6ba056
am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs
...
* commit '7e4dc922d949c7aec0a2a813e9487067e47e4c51':
Docs: Fixes a terminology error in simplified Chinese on-boarding docs
2015-07-02 02:32:59 +00:00
Abodunrinwa Toki
8fbe1a0cfc
Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev
2015-07-02 02:29:34 +00:00
Wale Ogunwale
ee5489606e
am b29d573d: am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
...
* commit 'b29d573dda8f615447bdfbddd0a3e72aa78c2775':
Prevent system uid component from running in an app process
2015-07-02 02:25:46 +00:00
David Friedman
fa8eb1e0d4
Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs
2015-07-02 02:24:14 +00:00
David Friedman
7e4dc922d9
Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs
2015-07-02 02:23:55 +00:00
David Friedman
de81619dea
Docs: Localization of Design pages on DAC.
...
Bug: 20503708
Change-Id: Id3a4f5900d99125a1475d939d43444f46555018c
2015-07-01 19:21:09 -07:00
Wale Ogunwale
b29d573dda
am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
...
* commit 'b85962df1ee6be2bba4c26fbd0964ade2c73a9c9':
Prevent system uid component from running in an app process
2015-07-02 02:14:44 +00:00
Wale Ogunwale
b85962df1e
am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
...
* commit 'e155eef4881c1ec8063a62619fe29aa6e8074b71':
Prevent system uid component from running in an app process
2015-07-02 01:36:17 +00:00
Wale Ogunwale
ad6e14fe71
am 577dd7e0: am d9de45ad: am 2adcfa1c: am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
...
* commit '577dd7e0c60fc9746ed8f092b5445e92f66f5e38':
Prevent system uid component from running in an app process
2015-07-02 01:29:00 +00:00
Wale Ogunwale
288465eaa2
am d91dbca3: am 2f8cac6b: am 655b08c3: am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev
...
* commit 'd91dbca3dab649283d5024534f1b7d27c4aa7535':
Prevent system uid component from running in an app process
2015-07-02 01:28:54 +00:00
Filip Gruszczynski
9fbb169644
am 545c5b38: am 9f8e1f5d: am aabc9869: am 03850591: Handle outsets when resized is called due to rotation.
...
* commit '545c5b383eee1d477f952490ad7c19e7b17b6e99':
Handle outsets when resized is called due to rotation.
2015-07-02 01:28:48 +00:00
Wale Ogunwale
e155eef488
am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
...
* commit '2735ac71e6d8d1c00b95104057ac9365abb485d9':
Prevent system uid component from running in an app process
2015-07-02 01:22:06 +00:00
