Matthew Williams
6d13650c74
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2
...
am: a0d20db02f
2015-11-13 01:56:30 +00:00
Matthew Williams
a0d20db02f
Sync extras bundle comparison can throw NPE am: c0f39c1ece
...
am: 34b700a7c2
2015-11-13 01:50:11 +00:00
Matthew Williams
34b700a7c2
Sync extras bundle comparison can throw NPE
...
am: c0f39c1ece
2015-11-13 01:41:59 +00:00
Matthew Williams
c0f39c1ece
Sync extras bundle comparison can throw NPE
...
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033
2015-11-11 14:34:04 +00:00
Paul Jensen
4cbfe3316f
am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit '773d71e7c45d12810267bb24735360da6e5b258d':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 11:21:27 +00:00
Paul Jensen
10a7d7449d
am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
...
* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:21:22 +00:00
Paul Jensen
773d71e7c4
am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 11:13:48 +00:00
Paul Jensen
96cd7c14b5
am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
...
* commit '635f871132449bea7489f6a61276979beeee5591':
Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:13:40 +00:00
Paul Jensen
962c3a0f2d
am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 11:06:32 +00:00
Paul Jensen
635f871132
am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
...
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:06:27 +00:00
Paul Jensen
ece4ac2105
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev
2015-09-23 10:59:31 +00:00
Paul Jensen
a9e9834314
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
2015-09-23 10:58:57 +00:00
Zach Jang
b5173241d1
am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit 'e54c195a53694696e0913722fa721c882e33753e':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 19:10:46 +00:00
Zach Jang
e54c195a53
am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 18:58:18 +00:00
Zach Jang
0a8197b1e4
am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '1cf21e443aaf207b962f50169be28c0babe71f61':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-17 20:04:23 +00:00
Zach Jang
1cf21e443a
DO NOT MERGE - Backport of ag/748165 to klp-dev
...
Security patch level in Settings
b/23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
2015-09-17 01:20:27 +00:00
Paul Jensen
2b6af396ad
Don't mark NetworkRequests restricted when they don't have restricted caps
...
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted. Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.
Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
(cherry picked from commit aae613d961
2015-08-28 12:50:09 -04:00
Paul Jensen
a12044215b
Fix NOT_RESTRICTED network capability and enforce it.
...
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission
Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 487ffe7d3d
2015-08-28 12:48:11 -04: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
John Reck
d955dceb4f
am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
...
* commit '862540cdb11a7128ae1fd670136f398645b4af7b':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 00:51:07 +00:00
John Reck
862540cdb1
Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
2015-05-14 00:40:45 +00:00
John Reck
a5b28b92b1
am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
...
* commit '69355eaa1c1f4bfc961d5dd9fdb0f3817d36d5f0':
DO NOT MERGE Backport of limited jank-tracking metrics
2015-05-13 21:52:50 +00:00
John Reck
25607a6642
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
...
This reverts commit 2614bd225f
2015-05-13 21:42:28 +00:00
John Reck
69355eaa1c
Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
2015-05-13 21:42:13 +00:00
Svet Ganov
db672b6cde
am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
...
* commit '00e91901fd1dd007de196ada04e3fc2f79e1be73':
DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:18:10 +00:00
Svet Ganov
68e6b5055b
DO NOT MERGE Don't take flags when creating app widget config activity.
...
bug:19618745
Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
2015-04-20 17:16:38 +00:00
Quddus Chong
c736e8cf41
am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev
...
* commit 'f0ab39c10b614514ba4a600aa6fd4354253cde73':
Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
2015-04-08 17:53:44 +00:00
Quddus Chong
a9f6a9b769
Fixed broken link in UiAutomation.setRunAsMonkey() method description.
...
bug: 19711873
Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
2015-04-07 13:04:39 -07:00
Svetoslav
c6be7545b4
am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
...
* commit '37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
2015-03-31 16:33:21 +00:00
Svetoslav
37661db7fa
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
...
AccessibilityNodeInfo refresh was getting the latest cached
state but this is not good enough as an accessibility service
can execute an action on the node and then refresh it to get
the new state.
bug:16954787
Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe
(cherry picked from commit 5738fec00d
2015-03-31 01:25:35 +00:00
John Reck
2614bd225f
DO NOT MERGE Backport of limited jank-tracking metrics
...
Bug: 19821830
Cherry-pick of ba6adf66d3e70c5754d0
2015-03-18 14:22:01 -07:00
Kenny Root
693ea60e9e
Track change to Conscrypt
...
Change way in which an outside caller can get the preferred SSLContext.
(cherry picked from commit 8a97063720
2015-03-17 21:27:05 +00:00
Craig Mautner
83a63bac5d
am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
...
* commit '8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-04 16:15:35 +00:00
Craig Mautner
8fa394fa8c
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
2015-03-04 16:09:29 +00:00
Joe Fernandez
1137ca03be
am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:36:02 +00:00
Joe Fernandez
246a3a4a79
am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:29:33 +00:00
Joe Fernandez
14fcef3bf0
am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:22:42 +00:00
Joe Fernandez
c4418980a0
am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:15:29 +00:00
Andrew Solovay
27f5337841
Minor typo fixes in managed profile Javadoc reference pages.
...
See first comment for stage location.
bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
2015-03-02 17:22:18 -08:00
Jim Miller
19847b07e8
am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
...
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
Remove TrustAgent whitelisting API
2015-02-25 18:09:54 +00:00
Jim Miller
bc4f2ccf6c
Remove TrustAgent whitelisting API
...
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.
Bug 19461292
Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
2015-02-24 20:15:02 -08:00
Craig Mautner
40f616b1f6
Do not make ActivityContainer available to apps. DO NOT MERGE
...
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.
Fixes bug 19394591.
Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-19 09:44:53 -08:00
Marco Nelissen
2f71ee24c5
am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
...
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
Fix NPE
2015-02-18 00:01:02 +00:00
Marco Nelissen
ffaee8bda9
Merge "Fix NPE" into lmp-mr1-dev
2015-02-17 23:54:30 +00:00
Craig Mautner
ab8f60e425
am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:36:51 +00:00
Craig Mautner
a94e42970d
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
2015-02-17 23:30:34 +00:00
Alan Viverette
504c77e1ae
am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
...
* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
Fix year picker initial range
2015-02-17 22:36:06 +00:00
Marco Nelissen
0e24cb7fb5
Fix NPE
...
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.
Bug: 19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
2015-02-17 14:35:37 -08:00
Alan Viverette
2a90fa6d94
Fix year picker initial range
...
BUG: 19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
2015-02-17 21:11:36 +00:00
