Jim Miller
4b3bd02a14
am 45ff18ee: am b76bbf1b: am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
...
* commit '45ff18ee83e6bcc2eed42b24cfb74dc9ba507bb3':
Remove "final" qualifier from AuthenticationResult
2015-07-09 04:16:12 +00:00
Robert Greenwalt
6bb9ce2c71
am 5a38c8e9: am 3d345232: am 031b9477: am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
...
* commit '5a38c8e96454f690b42732d9f77a4314c5759e3f':
Fix permissions on TelephonyManager
2015-07-09 04:16:06 +00:00
David Friedman
587f9fb2eb
am 15d1c1c9: am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
...
* commit '15d1c1c95b3d8f25aad81dfdc2fc55028968242e':
Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
2015-07-09 04:09:35 +00:00
Dirk Dougherty
7ed87b8eb7
am 492123d5: am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
...
* commit '492123d5e672ddab8a6777981a62a24206622ae7':
Doc change: minor updates to KIs and AFW behavior changes.
2015-07-09 04:09:32 +00:00
Jim Miller
45ff18ee83
am b76bbf1b: am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
...
* commit 'b76bbf1b94853917e23668376927587b93a70b56':
Remove "final" qualifier from AuthenticationResult
2015-07-09 04:02:14 +00:00
Robert Greenwalt
5a38c8e964
am 3d345232: am 031b9477: am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
...
* commit '3d34523200cb69f8c13a7a99ad5429edbf0bcc12':
Fix permissions on TelephonyManager
2015-07-09 04:02:08 +00:00
David Friedman
15d1c1c95b
am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
...
* commit '064f8b68f9e2404426ba37ce697b52dba6418810':
Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
2015-07-09 03:56:07 +00:00
Dirk Dougherty
492123d5e6
am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
...
* commit '119683d12751ae657576d45448cd6f83478a0b55':
Doc change: minor updates to KIs and AFW behavior changes.
2015-07-09 03:56:01 +00:00
Dirk Dougherty
95fc4f45de
am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
...
* commit '9d5df5ca0491dcb2309c81ec497137f5d7c7a602':
Doc change: add x86 to emulator spec.
2015-07-09 03:54:37 +00:00
Jim Miller
b76bbf1b94
am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
...
* commit '253129f90f1fcbf856ad4ec91855713e774e9cb4':
Remove "final" qualifier from AuthenticationResult
2015-07-09 03:49:41 +00:00
Robert Greenwalt
3d34523200
am 031b9477: am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
...
* commit '031b9477663e0974fbc765795ccd7694a0430b5a':
Fix permissions on TelephonyManager
2015-07-09 03:49:38 +00:00
Robert Greenwalt
8d48252b80
Revive NetworkInfo's SUSPENDED state.
...
This got lost in the multinetwork work for L. It means
that if telephony stops having the ability to pass packets for a while
the rest of the platform doesn't know.
Telephony enters the suspended state if it enters a telephony call
while using certain radio access technologies, or if it switches to
one of those RATs while in a call. It also can enter this state if
it temporarily loses contact with the network - the modem will
not report the loss of the data call for an indeterminant time in
the hope that regaining the network will restore the connection
without harm to any ongoing ip layer interactions. For example
passing through a tunnel or taking an elevator trip may use this
mechanism.
bug: 19637156
Change-Id: If9fde68175e8561c19323c81fbfcb02a6e5a00fb
2015-07-08 20:42:55 -07:00
David Friedman
064f8b68f9
am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
...
* commit 'dde5e2635588b1949fbda31ef096b0ee838ae761':
Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
2015-07-09 03:39:05 +00:00
Dirk Dougherty
119683d127
am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
...
* commit '0ffd7158b2b6db8c3740c7bdaa55b39cede1c3fb':
Doc change: minor updates to KIs and AFW behavior changes.
2015-07-09 03:39:01 +00:00
Jim Miller
253129f90f
am 748bc36f: Remove "final" qualifier from AuthenticationResult
...
* commit '748bc36f2eebfdc67520c5025b48fefdfd8d7c01':
Remove "final" qualifier from AuthenticationResult
2015-07-09 03:34:54 +00:00
Robert Greenwalt
031b947766
am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
...
* commit '348988c5704a5a6eb6aec093e295c2d9f00ee33c':
Fix permissions on TelephonyManager
2015-07-09 03:34:47 +00:00
Dirk Dougherty
9d5df5ca04
Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
2015-07-09 03:25:40 +00:00
Dirk Dougherty
4e1cc12004
Doc change: add x86 to emulator spec.
...
Change-Id: I86209cf29f6fd2e0e73106cd0ba2aa81e54bcde1
2015-07-08 20:23:04 -07:00
David Friedman
dde5e26355
Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
2015-07-09 03:21:47 +00:00
Jim Miller
748bc36f2e
Remove "final" qualifier from AuthenticationResult
...
This allows mock implementations to be created for testing
purposes.
Fixes bug 22362080
Change-Id: I5ff002c077d22b1338f2f4e394ad19827bb2ae9c
2015-07-09 03:19:31 +00:00
Robert Greenwalt
348988c570
Merge "Fix permissions on TelephonyManager" into mnc-dev
2015-07-09 03:19:26 +00:00
Dirk Dougherty
0ffd7158b2
Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
2015-07-09 03:14:47 +00:00
Dirk Dougherty
ecf63e4d54
Doc change: minor updates to KIs and AFW behavior changes.
...
Change-Id: If1af0f85593db48b241d81dcb6df9d4a5c703105
2015-07-08 20:10:49 -07:00
Sanket Padawe
44e1abd579
am 9978aef7: am fd1b5726: am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
...
* commit '9978aef72b4f11a10c3bd8fe03fcbe7f7b7a9c7e':
Add Null checks while processing pairing cancel intent
2015-07-09 02:09:32 +00:00
Adam Lesinski
8e82c794bb
am 3e2b53ff: am 1ad61b33: am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
...
* commit '3e2b53ff6981b7ef857cb28c5b2ddb3bc71002b9':
BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 02:09:26 +00:00
Sanket Padawe
9978aef72b
am fd1b5726: am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
...
* commit 'fd1b57263cc07a3a77d2ee076726758bd1d97d36':
Add Null checks while processing pairing cancel intent
2015-07-09 01:56:03 +00:00
Adam Lesinski
3e2b53ff69
am 1ad61b33: am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
...
* commit '1ad61b3314b1ea3a99d804ec9a89caae25636897':
BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 01:55:56 +00:00
Filip Gruszczynski
5e16aa5164
am b52df916: am d705f355: am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."
...
* commit 'b52df916207ac831b9b7e525fd967a4796a39a3a':
Revert "Fix NPE when requesting outsets for detached view."
2015-07-09 01:49:24 +00:00
Sanket Padawe
fd1b57263c
am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
...
* commit 'af468addb672ef002dee64376bc06f2bf8c6c0f9':
Add Null checks while processing pairing cancel intent
2015-07-09 01:42:19 +00:00
Adam Lesinski
1ad61b3314
am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
...
* commit '1549adb4eaef28ef41ebd063df1e339de035e19d':
BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 01:42:15 +00:00
Filip Gruszczynski
b52df91620
am d705f355: am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."
...
* commit 'd705f35568c85f2ae6e6ff1f4aae53c3556d6589':
Revert "Fix NPE when requesting outsets for detached view."
2015-07-09 01:38:34 +00:00
Sanket Padawe
af468addb6
am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
...
* commit '58295e71d293c131508d280f1373d94716348b2e':
Add Null checks while processing pairing cancel intent
2015-07-09 01:31:23 +00:00
Robert Greenwalt
43a69616a5
am d1e2b9d5: am 41af6cc5: am 7649e156: am de335a7d: Merge "Fix Permission Typo." into mnc-dev
...
* commit 'd1e2b9d5508263dc8c82d4b8492470452b174e80':
Fix Permission Typo.
2015-07-09 01:31:22 +00:00
Adam Lesinski
1549adb4ea
am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
...
* commit '7fb1655a891de275ab8a752294c42b9c13352af6':
BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 01:31:20 +00:00
Filip Gruszczynski
d705f35568
am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."
...
* commit '45eb3ea667dac8d97a91781f01875148bacfe74c':
Revert "Fix NPE when requesting outsets for detached view."
2015-07-09 01:22:04 +00:00
Sanket Padawe
58295e71d2
Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
2015-07-09 01:16:03 +00:00
Adam Lesinski
7fb1655a89
Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
2015-07-09 01:15:15 +00:00
Mady Mellor
d84ab3eab0
am b2ff3bd4: am 88e76d88: am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
...
* commit 'b2ff3bd42b06ea8c1a95b830f96d6ffee92d1a3a':
Use hint text to position handle / floating tool bar popups
2015-07-09 01:14:50 +00:00
Svetoslav
122350fca7
am 843d7216: am 353835e1: am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
...
* commit '843d721647bf39f4f819b9decc090a9196c1f706':
Fix reset permissions on clear data and package uninstall.
2015-07-09 01:14:44 +00:00
Svet Ganov
187181a109
am 96e2b85a: am 862c6364: am c69e1410: am 9b84b5c5: Merge "Update storage group icon" into mnc-dev
...
* commit '96e2b85a043d0838385ee65929872b4fc0ef247d':
Update storage group icon
2015-07-09 01:14:39 +00:00
Jack Yu
f99e20d6c5
am 230629de: am 40f07062: am 379aa438: am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
...
* commit '230629de49b032dfe92ce31b97e261ff962b04c2':
Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
2015-07-09 01:14:34 +00:00
Amith Yamasani
2cd92043c7
am d1087e74: am 5b65be96: am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev
...
* commit 'd1087e74ad38c0918f325775873330110e497eea':
Qualify the uid with the userId when granting permissions
2015-07-09 01:14:27 +00:00
Robert Greenwalt
d1e2b9d550
am 41af6cc5: am 7649e156: am de335a7d: Merge "Fix Permission Typo." into mnc-dev
...
* commit '41af6cc592935c7548eb6389ba5fa8adca9f1441':
Fix Permission Typo.
2015-07-09 01:13:20 +00:00
Svet Ganov
ad3b297557
Add an API for apps to query if a permisison is denied by policy.
...
bug:22177216
Change-Id: I32227f55097fae997f33743fd1eee06cb18f47f1
2015-07-08 18:12:58 -07:00
Filip Gruszczynski
45eb3ea667
Revert "Fix NPE when requesting outsets for detached view."
...
This reverts commit b010291ace13947fcc76b1a64eaa67880e15f0a6.
Change-Id: If86ce92daac9e80d5fc2e9f707d937e7c6e91a74
2015-07-09 01:06:40 +00:00
Mady Mellor
b2ff3bd42b
am 88e76d88: am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
...
* commit '88e76d88d7a1ce18c5a377b223525da7f1fa5f4a':
Use hint text to position handle / floating tool bar popups
2015-07-09 01:04:05 +00:00
Svetoslav
843d721647
am 353835e1: am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
...
* commit '353835e12d1419a08bd1030db29fe4740cf09598':
Fix reset permissions on clear data and package uninstall.
2015-07-09 01:04:00 +00:00
Svet Ganov
96e2b85a04
am 862c6364: am c69e1410: am 9b84b5c5: Merge "Update storage group icon" into mnc-dev
...
* commit '862c63644afef8a4c3ee360b6b6d8162d260510b':
Update storage group icon
2015-07-09 01:03:54 +00:00
Jack Yu
230629de49
am 40f07062: am 379aa438: am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
...
* commit '40f0706293f77c8d185545ee42e33358eba968f8':
Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
2015-07-09 01:03:49 +00:00
Amith Yamasani
d1087e74ad
am 5b65be96: am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev
...
* commit '5b65be96ab061cbdba479795ff467c0eab92c28a':
Qualify the uid with the userId when granting permissions
2015-07-09 01:03:43 +00:00