summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Move apache specific portions of android.net.http to external/apache-http.Narayan Kamath2015-02-121-7/+4
| | | | | | | | | | | | | | | | | | | We continue to compile external/apache-http into ext.jar. This contains a few changes apart fom the classes moving around : - Makefile changes to build docs and api-stubs for now. A future change will revert these changes and remove these classes from stubs and docs. - Hardcode event IDs in legacyerrorstrings to avoid a dependency between the frameworks and apache. These strings are on their way out and will never change anyway. - Remove imports due to {@link} tags and use {@code} instead. - Remove an accidental(?) dependency on apache commons code that's a part of apache-http. bug: 18027885 Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf
* Add ProcessInfoService to activity manager.Ruben Brunk2015-01-301-0/+1
| | | | | | | | - Adds a new AIDL interface for querying process information from activity manager. Bug: 19186859 Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
* am 321e7246: am 301e1def: am 24328660: Merge "Check in "current" system API ↵Ying Wang2015-01-221-0/+5
|\ | | | | | | | | | | | | files." into lmp-mr1-dev * commit '321e72461bb561ea81f8f7bfaaa0c29e0180bc75': Check in "current" system API files.
| * am 301e1def: am 24328660: Merge "Check in "current" system API files." into ↵Ying Wang2015-01-221-0/+5
| |\ | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '301e1def7ab741830e1fbc02a291ff295a36c345': Check in "current" system API files.
| | * Check in "current" system API files.Ying Wang2015-01-201-0/+5
| | | | | | | | | | | | | | | | | | | | | The API files were generated by running "make showcommands update-system-api". Bug: 18960664 Change-Id: Ibb4756d98be3cbf67f6103f5d5d8ff060b3c34c9
* | | am b8794c76: Merge "resolved conflicts for merge of 3d64a850 to ↵Chad Brubaker2015-01-151-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp * commit 'b8794c76d677ef04c96b9edc002fe6e1f53022c7': Generate IKeystoreService using aidl
| * | resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aospChad Brubaker2015-01-141-0/+1
| |\ \ | | | | | | | | | | | | Change-Id: Ieed2c2a3b9977c30bc5318317c91c29907aa1377
| | * | Generate IKeystoreService using aidlChad Brubaker2015-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces IKeystoreService.java with IKeystoreService.aidl and changes the methods that passed down a byte[][] to instead pass down a KeystoreArguments which is currently a thin parcelable wrapper around a byte[][]. Change-Id: I6367bcf57562f41a27aab14f1903b74995cb65c2
* | | | MidiManager updates:Mike Lockwood2015-01-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MIDI ports are now implemented as file descriptors directly between the sender and receiver, so the MidiService is no longer in the message path. To facilitate the above, each port has its own file descriptor, rather than multiplexing all ports on a device through a single socket. Added a new class MidiDeviceServer, which is used by implementors of MIDI devices. This replaces the MidiVirtualDevice class (which only was included in changes that were reviewed but never submitted). The USB MIDI implementation has moved from the MIDI service to the USB service. The USB MIDI implementation uses MidiDeviceServer as its interface, so we now have a common interface for all MIDI device implementations. Change-Id: I8effd1583f344beb6c940c3a24dbf20b477a6436
* | | | am 4dcc8d28: am d7771768: Merge "Build against libphonenumber-platform."Narayan Kamath2014-12-231-5/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: 6d2d7f1 * commit '6d2d7f19a0b9c1172428ef4c79453b9d1e9ed5ca': Build against libphonenumber-platform.
| * | | am 4dcc8d28: am d7771768: Merge "Build against libphonenumber-platform."Narayan Kamath2014-12-231-5/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/| * commit '4dcc8d28d7933a4a08d2330f78f3b4486d2ef264': Build against libphonenumber-platform.
| | * Build against libphonenumber-platform.Narayan Kamath2014-12-181-5/+1
| | | | | | | | | | | | | | | | | | Don't compile libphonenumber sources directly. Change-Id: Ib2efd84535a2cffe773271fd1ddcb66a6a651cb8
| | * Move preloaded-classes out of framework.jar.Ying Wang2014-11-171-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Instead we install preloaded-classes as a standalone configuration file /system/etc/preloaded-classes, so we can configure different file per product. Bug: 18305157 Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
* | | am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio ↵Jean-Michel Trivi2014-12-091-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | focus handling" into lmp-mr1-dev * commit '83d0c86b869fe84b3172028a5598ebd87ce7745b': Support collaborative audio focus handling
| * | Support collaborative audio focus handlingJean-Michel Trivi2014-12-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new flag for an app to define it doesn't duck, but rather pauses when losing focus with AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK. This flag is to be used when requesting focus. Add support for AudioPolicy to specify whether it will implement ducking itself, rather than it being handled by an app. When ducking is handled by a policy, do not notify focus owners when they lose audio focus with LOSS_TRANSIENT_CAN_DUCK, unless they would have paused, as expressed with the AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS flag. Add a focus listener for a policy to be notified of focus changes so it can properly implement its own ducking. Bug 16010554 Change-Id: I11d7cdb85c52fd086128a44f4d938aaa44db5c25
* | | am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of ↵Benjamin Franz2014-12-091-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | bluetooth headset connections." into lmp-mr1-dev * commit 'f4a76651b0fec69242822e57441b1a937fb6daf3': Change the routing path of bluetooth headset connections.
| * | Merge "Change the routing path of bluetooth headset connections." into ↵Benjamin Franz2014-12-051-0/+1
| |\ \ | | | | | | | | | | | | lmp-mr1-dev
| | * | Change the routing path of bluetooth headset connections.Benjamin Franz2014-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HeadsetService is now bound directly by the BluetoothManagerService. The IBinder object related to the HeadsetService is then given back to the BluetoothHeadset and to the client app. This change makes the HeadsetService available for managed profile clients. Bug: 16968338 Change-Id: I016d1837e4f987c0fab1fc2c64cb06eb91b24d87
* | | | Merge "MIDI Manager work in progress"Mike Lockwood2014-12-081-0/+2
|\ \ \ \
| * | | | MIDI Manager work in progressMike Lockwood2014-12-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still to do: Add MidiInputPort and MidiOutputPort classes Schedule sending MIDI events in the future Security/permissions Reconsider interface for virtual devices Look into performance optimizations Change-Id: I9b7d63b196996a04be0a830efa913043da1328a8
* | | | | am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" ↵Cheuksan Wang2014-12-041-4/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '29ac679f9f85a68eca03c262e740d62f8af66797': new SMS/MMS carrier app API
| * | | | Merge "new SMS/MMS carrier app API" into lmp-mr1-devCheuksan Wang2014-12-041-4/+3
| |\ \ \ \
| | * | | | new SMS/MMS carrier app APICheuksan Wang2014-12-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes based on api council review BUG: 18005911 Change-Id: I23bd207ce70f7fa201d6d964c1700cfc44cb009b
* | | | | | Merge "Allow compilation with Jack."Yohann Roussel2014-12-041-0/+2
|\ \ \ \ \ \
| * | | | | | Allow compilation with Jack.Yohann Roussel2014-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I03ccd6cd92102f03d1316b6a1184c49029c91ea0
* | | | | | | am 8e78f0a7: am 9aa9e46b: am 5244ab68: am b769fc0c: am 512103d6: am ↵Trevor Johns2014-12-031-1/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs * commit '8e78f0a7122432c4cfabe86ccf46c724297e11b0': Docs: Add "admin" to samples categories
| * | | | | | am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples ↵Trevor Johns2014-12-031-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | categories" into lmp-docs * commit 'b769fc0c576f485022330b40ae5180fb23cc53ee': Docs: Add "admin" to samples categories
| | * | | | | | Docs: Add "admin" to samples categoriesTrevor Johns2014-12-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains samples for device administration APIs. Issue: 18544051 Change-Id: I8e157ba163848ac0356f2669a9cadd0f76b4ae9a
* | | | | | | | am fee5e3d3: am 50511096: am de9848c6: Merge "Initial changes to add ↵Winson Chung2014-12-031-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev * commit 'fee5e3d32a26c3ac2136e37cad15fd9cc41066db': Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
| * | | | | | Initial changes to add callback on task stack changes. (Bug 17672056, Bug ↵Winson Chung2014-12-021-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18291345) Add a listener to listen for changes in the Task stacks to preload thumbnails from the system. In addition, reduce the amount of synchronous work done in activity creation and first measure/layout passes. Change-Id: I8bd9155d7a05e89c190a20429acff69a17808208
* | | | | | am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to ↵Jorim Jaggi2014-11-261-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-ub-dev" into lmp-mr1-ub-dev * commit 'f1e6d2315eea6e9f289b8c1bafc04a4cbc6f05e1': Make IKeyguardService interface asynchronous
| * | | | | Make IKeyguardService interface asynchronousJim Miller2014-11-251-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a state callback so lockscreen reports back whenever its state relevant for PhoneWindowManager changed, instead of synchronously calling into SysUI which can lead to deadlocks. Directly use LockPatternUtils for isSecure, and optimize the number of calls to this method to optimize layout performance. Bug: 17677097 Change-Id: I5d491fc8884d4f84d9562626b9ea0d5eaa5166fc
* | | | | am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to ↵Wink Saville2014-11-241-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | SubscriptionManager API as per API council." into lmp-mr1-dev * commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc': Additional changes to SubscriptionManager API as per API council.
| * | | | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 17575308 Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
* | | | | am b5ba786c: am 18ab5c21: Merge "Add an API to check availability of ↵Jaewan Kim2014-11-211-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Ethernet interface." into lmp-mr1-dev automerge: 52dcc7f * commit 'b5ba786ccb9265ed076cda088ddbfded3ecc7f85': Add an API to check availability of Ethernet interface.
| * | | | Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-devJaewan Kim2014-11-201-0/+1
| |\ \ \ \
| | * | | | Add an API to check availability of Ethernet interface.Jaewan Kim2014-11-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18045481 Change-Id: I95358241b431cfe4435ce70c23c9a639b9dc4d58
* | | | | | am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to ↵Wink Saville2014-11-211-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41 * commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0': Revert "Additional changes to SubscriptionManager API as per API council."
| * | | | | Revert "Additional changes to SubscriptionManager API as per API council."Wink Saville2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit baf21da1e17ef358632c078128d381b3be218a08. Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
* | | | | | am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager ↵Wink Saville2014-11-211-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API as per API council." into lmp-mr1-dev automerge: 68c21d6 * commit '07fb24576a5a425798a2aa004dd49682f414cbf7': Additional changes to SubscriptionManager API as per API council.
| * | | | | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 17575308 Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
* | | | | | am c2045047: resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aospYing Wang2014-11-171-3/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c2045047735522f50bc1d2618280bd37306f18d2': Move preloaded-classes out of framework.jar.
| * | | | | Move preloaded-classes out of framework.jar.Ying Wang2014-11-171-3/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead we install preloaded-classes as a standalone configuration file /system/etc/preloaded-classes, so we can configure different file per product. Bug: 18305157 Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
* | | | | am 0f064207: am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" ↵Abhijith Shastry2014-11-141-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '0f0642075e42f415d7f5244c5d94fe726756afa0': new sms/mms carrier app API
| * | | | Merge "new sms/mms carrier app API" into lmp-mr1-devAbhijith Shastry2014-11-131-0/+4
| |\ \ \ \
| | * | | | new sms/mms carrier app APICheuksan Wang2014-11-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18005911 Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
* | | | | | am 7b3b8804: am 8d6699cc: am 19865ccd: am 5d7f91c7: am 40ac90e9: am ↵Renato Mangini2014-11-131-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b657d92: Fix the order of sample categories left nav. * commit '7b3b8804e7da463dc14b142e5e4323350cdb9bc7': Fix the order of sample categories left nav.
| * | | | | am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories ↵Renato Mangini2014-11-121-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | left nav. * commit '5d7f91c77605a5c444eaaae2b812280c57ca244c': Fix the order of sample categories left nav.
| | * | | | Fix the order of sample categories left nav.Renato Mangini2014-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18323953 Change-Id: Iea882fed74428d092c02e3cfcf2171c4c596b8a8
* | | | | | am 68fde80a: am 2a3ce185: am ca011519: am a53b8bad: am 4b7b68d8: Add ↵Renato Mangini2014-11-121-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "notification" category for samples. automerge: d76afdb * commit 'd76afdb5e7978b5d57214bd83cacc754e23bfe60': Add "notification" category for samples.
generated by cgit v1.1 at 2025-02-04 23:26:38 +0000