summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Reject AlgorithmParameters of wrong type." into mnc-devAlex Klyubin2015-07-082-0/+12
|\
| * Reject AlgorithmParameters of wrong type.Alex Klyubin2015-07-072-0/+12
| | | | | | | | | | | | | | | | | | | | This makes Android Keystore Cipher implementations reject rather than ignore AlgorithmParameters of wrong algorithm type. The danger in not doing so is that a Cipher will produce output that does not actually depend on the provided AlgorithmParameters. Bug: 22330716 Change-Id: Ifa9de2c74f2fe4b738a3731c895059dddd075a13
* | Merge "Lock screen text: consider possible WFC service in APM" into mnc-devEtan Cohen2015-07-082-3/+74
|\ \
| * | Lock screen text: consider possible WFC service in APMEtan Cohen2015-07-082-3/+74
| | | | | | | | | | | | | | | Bug: 22302226 Change-Id: Icd885b45ced2b57665fbed54ec6caac36839db6c
* | | Merge "Fixed a bug where collapserunnables where dropped" into mnc-devSelim Cinek2015-07-081-5/+5
|\ \ \ | |/ / |/| |
| * | Fixed a bug where collapserunnables where droppedSelim Cinek2015-07-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | When a runnable was added while iterating over it, it was cleared right after. Bug: 22260165 Change-Id: I2faf9af61c08853eb8364d49ccd36d686a4b3bf8
* | | Merge "Remove bang from not connected wifi" into mnc-devJason Monk2015-07-081-1/+1
|\ \ \
| * | | Remove bang from not connected wifiJason Monk2015-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 22281118 Change-Id: I4752c0e7378fca4a94c73083a8a394cde7d6f170
* | | | Merge "audio: add definitions for devices connected over IP" into mnc-devEric Laurent2015-07-084-0/+19
|\ \ \ \
| * | | | audio: add definitions for devices connected over IPEric Laurent2015-07-064-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22068684. Change-Id: I0411679d2852135d4af3016844ced74f7718fa0d
* | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-0877-43/+351
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-0877-43/+351
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81911866f73a1274582b6c93803eebff7e0e229e Auto-generated-cl: translation import
* | | | | Merge "provide a cleaner notification dump" into mnc-devChris Wren2015-07-082-21/+211
|\ \ \ \ \
| * | | | | provide a cleaner notification dumpChris Wren2015-07-072-21/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respond to --stats by generating a cleaner, easier to parse dump. Optional argument tells historical stats when to start aggregating. Don't emit debug information about current notification status. Bug: 20451514 Change-Id: Ie3d25b674421caa6c9e093f5643cb18d4138a7c8
* | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-085-10/+10
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-085-10/+10
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I5480292e44e527d094f57361680708eba4aef6d8 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-082-25/+25
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-082-25/+25
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5571e07743dcea7a5e3f064599480796132cc31c Auto-generated-cl: translation import
* | | | | | Merge "Clarify javadoc of setPermissionPolicy" into mnc-devBenjamin Franz2015-07-081-1/+8
|\ \ \ \ \ \
| * | | | | | Clarify javadoc of setPermissionPolicyBenjamin Franz2015-07-081-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22192363 Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-084-4/+4
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I173b85dbcf36fdc7023137949f7bb416dabc2cf5 Auto-generated-cl: translation import
* | | | | | am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." ↵Dirk Dougherty2015-07-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-preview-docs * commit 'cc040d583b121e6a028e2dc47691d3f4f98c6e70': Doc change -- update trade practices link.
| * \ \ \ \ \ am 7e8358c6: Merge "Doc change -- update trade practices link." into ↵Dirk Dougherty2015-07-081-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit '7e8358c6e5e97dc224be65890564d44a7a043461': Doc change -- update trade practices link.
| | * \ \ \ \ \ Merge "Doc change -- update trade practices link." into mnc-preview-docsDirk Dougherty2015-07-081-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Doc change -- update trade practices link.Dirk Dougherty2015-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40cc12831a9ae75289434aa2fc23a5001f87e619
* | | | | | | | | Merge "Prevent accidental unlocking of USB data transfer." into mnc-devZoltan Szatmary-Ban2015-07-081-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent accidental unlocking of USB data transfer.Zoltan Szatmary-Ban2015-07-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When DISALLOW_USB_FILE_TRANSFER is in effect, there must be no chance to unlock data transfer over USB. Bug: 22291579 Change-Id: I990fedbfeecd90e7dd26981034d0352b83dc694e
* | | | | | | | | | Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-devZoltan Szatmary-Ban2015-07-084-18/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Expose time-interval detail query on INetworkStatsSessionZoltan Szatmary-Ban2015-07-074-18/+49
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, force polling when a session is opened for NetworkStatsManager. Bug: 21864554 Bug: 21754685 Change-Id: I24ea822c2d5bc1421ec7ee65d0cfe27cf02dd69e
* | | | | | | | | | am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.Dirk Dougherty2015-07-084-62/+346
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '590a25a31367de154bca9556829bc0338cb4ca73': Doc change: add version notes for preview 2.
| * | | | | | | | | am 70f1aadd: Doc change: add version notes for preview 2.Dirk Dougherty2015-07-084-62/+346
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70f1aadd4bc1bfc96ddee08c38a5ac67ae531344': Doc change: add version notes for preview 2.
| | * | | | | | | | Doc change: add version notes for preview 2.Dirk Dougherty2015-07-084-62/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iacd3bf7bc3206f1a143bacbae5f3e7b7b5eefe7d
* | | | | | | | | | Merge "Make StorageMeasurement multiprofile aware." into mnc-devZoltan Szatmary-Ban2015-07-081-35/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make StorageMeasurement multiprofile aware.Zoltan Szatmary-Ban2015-07-031-35/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22117317 Bug: 22223456 Change-Id: Ic8a5c1fedcf71c5b1fcae04f32c3d9734a098517
* | | | | | | | | | | am 638ecb76: am 773861f0: Merge "Docs: Localized landing pages for M Preview ↵Dirk Dougherty2015-07-087-527/+502
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2 release." into mnc-preview-docs * commit '638ecb76b096c1224c8bf5c2a0bb4d0dd0f15b2f': Docs: Localized landing pages for M Preview 2 release.
| * | | | | | | | | | am 773861f0: Merge "Docs: Localized landing pages for M Preview 2 release." ↵Dirk Dougherty2015-07-087-527/+502
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-preview-docs * commit '773861f01d7aa19288a138eff160587cbc5e4c81': Docs: Localized landing pages for M Preview 2 release.
| | * | | | | | | | | Merge "Docs: Localized landing pages for M Preview 2 release." into ↵Dirk Dougherty2015-07-087-527/+502
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs
| | | * | | | | | | | | Docs: Localized landing pages for M Preview 2 release.David Friedman2015-07-087-527/+502
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie8f5f306cbc2188f99bfa2bfa21be40ac16c6725
* | | | | | | | | | | | am 0922b82a: am a7e0bfa6: Docs: Updates to M Preview 2 Download pages.David Friedman2015-07-088-168/+234
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0922b82a94fa8dc800945e96df03d30b1a14ac23': Docs: Updates to M Preview 2 Download pages.
| * | | | | | | | | | | am a7e0bfa6: Docs: Updates to M Preview 2 Download pages.David Friedman2015-07-088-168/+234
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7e0bfa68aee147bbb060e3bf5f51759c9f66817': Docs: Updates to M Preview 2 Download pages.
| | * | | | | | | | | | Docs: Updates to M Preview 2 Download pages.David Friedman2015-07-088-168/+234
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae26d516ea942523fb29292aa3e68db6ffea99f1
* | | | | | | | | | | am cb7a3b6b: am 201cfff4: Merge "Docs: Updated download page for M Preview; ↵David Friedman2015-07-082-22/+382
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new archive page for older versions" into mnc-preview-docs * commit 'cb7a3b6bc2525bb417a831562ccf6703b4bf1679': Docs: Updated download page for M Preview; new archive page for older versions
| * | | | | | | | | | am 201cfff4: Merge "Docs: Updated download page for M Preview; new archive ↵David Friedman2015-07-082-22/+382
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page for older versions" into mnc-preview-docs * commit '201cfff499c5138d8dec1180bfc12c6a16cd8fab': Docs: Updated download page for M Preview; new archive page for older versions
| | * | | | | | | | | Merge "Docs: Updated download page for M Preview; new archive page for older ↵David Friedman2015-07-082-22/+382
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | versions" into mnc-preview-docs
| | | * | | | | | | | | Docs: Updated download page for M Preview; new archive page for older versionsDavid Friedman2015-07-072-22/+382
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b12131f0cb2a7db70a5795489163889b4dbb5cd
* | | | | | | | | | | | am 73ce8abb: am 869050b3: Docs: Updated Preview TOC reflecting the newly ↵David Friedman2015-07-081-13/+76
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | localized pages. * commit '73ce8abb39d80cdfb10388cc92df16a1761b470d': Docs: Updated Preview TOC reflecting the newly localized pages.
| * | | | | | | | | | | am 869050b3: Docs: Updated Preview TOC reflecting the newly localized pages.David Friedman2015-07-081-13/+76
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '869050b396ff40db01241c8ed92667b94f1e962a': Docs: Updated Preview TOC reflecting the newly localized pages.
| | * | | | | | | | | | Docs: Updated Preview TOC reflecting the newly localized pages.David Friedman2015-07-071-13/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93531988223954c00c83780a99bc31f3500ca2c8
* | | | | | | | | | | | Merge changes I29f7abe6,I6c831467 into mnc-devDeepanshu Gupta2015-07-083-7/+780
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix Paint_Delegate.native_getRunAdvance() Add a default PackageManager to BridgeContext.
| * | | | | | | | | | | | Fix Paint_Delegate.native_getRunAdvance()Deepanshu Gupta2015-07-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22249573 Change-Id: I29f7abe6448f439059547e1c1e310d3d651ac2d8
generated by cgit v1.1 at 2024-09-22 12:34:28 +0000