summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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.
| * | | | | am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples.Renato Mangini2014-11-121-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'ca011519b61e2ae57dfe760547d7d073f7ec42f3': Add "notification" category for samples.
| | * | | | Add "notification" category for samples.Renato Mangini2014-11-111-1/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 18323953 Change-Id: Ifb78015604fd203baaf5f4c6496a86aa6c831227
* | | | | SubInfoRecord.aidl renamed to SubscriptionInfo.aidlWink Saville2014-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib56ce09ee8ee33fbfc454a83a2e1484056e17020
* | | | | am 6fafa8cd: am 36d059f9: am 138b8334: Obliterate LockPatternUtilsCacheAdrian Roos2014-11-121-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '6fafa8cdcecbb7daf1c96e15c513f8ff7260df80': Obliterate LockPatternUtilsCache
| * | | | Obliterate LockPatternUtilsCacheAdrian Roos2014-11-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is disabled dead code already and not useful anymore with the new caching in LockSettingsService. Bug: 18163444 Change-Id: Icc184e923e0fbeab31ed128336c01f835b24c6f2
* | | | | am 93fc415e: Merge "Update SubscriptionManager API as per API council." into ↵Wink Saville2014-11-121-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 43bbf30 automerge: e76308c * commit '93fc415e6219f59a5b1f2d6fd5e1647551a27742': Update SubscriptionManager API as per API council.
| * | | | Update SubscriptionManager API as per API council.Wink Saville2014-11-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 17575308 Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
* | | | | am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer ↵Dianne Hackborn2014-11-111-0/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | information. * commit '95ef0ac77738eac98e4952fe1e94db64c1560f5e': Add Activity API to get referrer information.
| * | | Add Activity API to get referrer information.Dianne Hackborn2014-11-111-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This expands the use of EXTRA_REFERRER to be relevant anywhere, allowing apps to supply referrer information if they want. However, if they don't explicitly supply it, then the platform now keeps track of package names that go with Intents when delivering them to apps, which it can be returned as the default value. The new method Activity.getReferrer() is used to retrieve this referrer information. It knows about EXTRA_REFERRER, it can return the default package name tracked internally, and it also can return a new EXTRA_REFERRER_NAME if that exists. The latter is needed because we can't use EXTRA_REFERRER in some cases since it is a Uri, and things like #Intent; URI extras can only generate primitive type extras. We really need to support this syntax for referrers, so we need to have this additional extra field as an option. When a referrer is to a native app, we are adopting the android-app scheme. Since we are doing this, Intent's URI creation and parsing now supports this scheme, and we improve its syntax to be able to build intents with custom actions and stuff, instead of being all hung up on custom schemes. While doing this, fixed a problem when parsing both intent: and new android-app: schemes with a selector portion, where we were not respecting any scheme that was specified. Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
* | | am 2cf2406d: am 86272c9c: am 4c24abe9: am 2988436b: am fb28bd15: Merge ↵Trevor Johns2014-10-231-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | "Docs: Add TOC page for Wearable samples" into lmp-dev * commit '2cf2406d9832bfb74b87b92eadd896c6e90bce46': Docs: Add TOC page for Wearable samples
| * | Docs: Add TOC page for Wearable samplesTrevor Johns2014-10-231-1/+2
| |/ | | | | | | Change-Id: I0fdf412f20fb2a45c34c9700ed1ca9446cfc6ff3
* | am 7468bb98: am e3d3aa3f: am df88ad0b: am e8a700e9: am 843e2343: Add ↵Evan Charlton2014-10-161-0/+1
|\ \ | |/ | | | | | | | | | | WindowManager.aidl to AIDL list * commit '7468bb98d52013d63af665b29b1a8e859fb74f75': Add WindowManager.aidl to AIDL list
| * Add WindowManager.aidl to AIDL listEvan Charlton2014-10-151-0/+1
| | | | | | | | | | | | | | | | | | WindowManager.aidl has an inner class (WindowManager.LayoutParams) which needs to be included, but slipped past the api/current.txt grep. This affects the SDK only Change-Id: I71bea4e602428ab588d17c5e57cbe08a1d6e9493
* | resolved conflicts for merge of 9963fc12 to masterEvan Charlton2014-10-141-71/+147
|\ \ | |/ | | | | Change-Id: I2339dcafc38693bf6c89d4e3643627270791442e
| * Update the SDK AIDL listEvan Charlton2014-10-131-70/+145
| | | | | | | | | | | | | | | | | | | | Populate the framework.aidl list with .aidl files which are: - In the android.* namespace - Not marked @hide - Do not have their corresponding .java files marked @hide Bug: 17952409 Change-Id: I1f4abf7abbc298a51605571cd168362dcc5603b2
generated by cgit v1.1 at 2025-01-09 07:43:40 +0000