summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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
* | am 5c90ccc3: am 520100d5: am fc696fb6: am 3ae2a715: am 9f928944: Merge ↵smain@google.com2014-10-101-0/+1
|\ \ | |/ | | | | | | | | | | "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev * commit '5c90ccc34e3fc13ac9c0ffbc52581bf02c0bf32b': update droiddoc option to include api level 21 for javadoc tagging
| * update droiddoc option to include api level 21 for javadoc taggingsmain@google.com2014-10-081-0/+1
| | | | | | | | Change-Id: Ifdb09267b0cdab4cd89aaea455de6270481ff230
* | am 81f06a6d: am 1603e30e: am 6ef845d3: am b4589115: am d6a2ab93: Merge ↵Andres Morales2014-10-071-1/+0
|\ \ | |/ | | | | | | | | | | "Remove dead NFC unlock code from fw/base" into lmp-dev * commit '81f06a6dce17ea44fd6a3110a15aec490cea4b2b': Remove dead NFC unlock code from fw/base
| * Remove dead NFC unlock code from fw/baseAndres Morales2014-10-061-1/+0
| | | | | | | | | | Bug:17883273 Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
* | am b51263b9: am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." ↵Tyler Gunn2014-09-131-8/+8
|\ \ | |/ | | | | | | | | | | into lmp-dev * commit 'b51263b99fc2c8293e1f0fe844e65ce2afec2089': Renaming Telecomm to Telecom.
| * Renaming Telecomm to Telecom.Tyler Gunn2014-09-121-8/+8
| | | | | | | | | | | | | | | | | | | | - Changing package from android.telecomm to android.telecom - Changing package from com.android.telecomm to com.android.server.telecomm. - Renaming TelecommManager to TelecomManager. Bug: 17364651 Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
* | am db7eb5b3: am 6d4c60e8: am b3ac0ef8: Merge "Replace the MHL register name ↵Jinsuk Kim2014-09-121-1/+1
|\ \ | |/ | | | | | | | | | | \'scratchpad\' with \'vendor\'" into lmp-dev * commit 'db7eb5b3c87c56128b421f5928242246f3261b39': Replace the MHL register name 'scratchpad' with 'vendor'
| * Replace the MHL register name 'scratchpad' with 'vendor'Jinsuk Kim2014-09-121-1/+1
| | | | | | | | | | Bug: 17479050 Change-Id: If6fe2949d17ad2d407df5b797c1915eb0e9bf421
* | am e9a3faa5: am 26c00d5a: am fd7d35d0: Merge "Reduce chance of notification ↵Griff Hazen2014-09-051-0/+1
|\ \ | |/ | | | | | | | | | | listener dropped messages." into lmp-dev * commit 'e9a3faa5d20d0adeed4a5bec8f3aeb131324b3f4': Reduce chance of notification listener dropped messages.
| * Merge "Reduce chance of notification listener dropped messages." into lmp-devGriff Hazen2014-09-051-0/+1
| |\
| | * Reduce chance of notification listener dropped messages.Griff Hazen2014-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing code for notification manager/listeners uses a oneway binder api to deliver messages. One problem with this is that notification objects can sometimes get fairly large, and can bump into the oneway binder transaction buffer if many happen at once. To reduce this issue, flip the service into a oneway delivery of a status bar notification holder, whose wrapped content is then immediately fetched upon receipt of the one-way message. This moves the meat of the fetch to be over a two-way interface without changing the properties of which object is actually sent (a tickle solution with lookup key would have changed this) Further research: attempt to chunk notification objects themselves. They can sometimes transfer hundreds of KB over a binder transaction. Bug: 15426276 Change-Id: Ib1a1f4ff848c16f80bcf2ae4dfd2b87a9091f0b2
* | | resolved conflicts for merge of a41f48f8 to masterRoboErik2014-09-051-0/+3
|\ \ \ | |/ / | | | | | | Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a
| * | Minor tweaks to MediaBrowserRoboErik2014-09-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | -A swapped the param order on MediaBrowser.MediaItem constructor -Added a missing aidl file for MediaItem bug:17205016 Change-Id: I61538d76f76a993ed5a47b881e0d291fef1d8db3
* | | am ac0f5a46: am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> ↵Michael Wright2014-09-021-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Callback" into lmp-dev * commit 'ac0f5a4616dab78a4216d826219379a663cc1139': VirtualDisplay.Callbacks -> Callback
| * | VirtualDisplay.Callbacks -> CallbackMichael Wright2014-09-011-1/+1
| |/ | | | | | | | | | | | | Also, rename methods to be onPaused instead of onDisplayPaused, etc. Bug: 17008630 Change-Id: Id9ead22a42d36ac338309f0f021ba341ed991144
* | am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs ↵RoboErik2014-08-281-2/+2
|\ \ | |/ | | | | | | | | | | per council feedback" into lmp-dev * commit 'ab71604780c4cccf238e1c78b7b05310c4a49583': Update to MediaBrowser APIs per council feedback
| * Update to MediaBrowser APIs per council feedbackRoboErik2014-08-281-2/+2
| | | | | | | | | | | | | | | | Does all the updates in the bug except the loadIcon/loadBitmap methods, which are removed per feedback from Sharkey. bug:17205016 Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
| * remove passpoint - DO NOT MERGEvandwalle2014-08-261-1/+0
| | | | | | | | | | This CL is dependent on I3d2a230b0362520b9f1b2bc3792260116971e106 Change-Id: I1a0d655877d9368d833d62e231797af4b2560862
* | am be414987: am ebe59a04: am 952e276a: Merge "Implement interfaces for MHL ↵Jungshik Jang2014-08-221-0/+1
|\ \ | |/ | | | | | | | | | | scratchpad command" into lmp-dev * commit 'be4149872edca53245b0236b666e76564ea5c3d7': Implement interfaces for MHL scratchpad command
| * Implement interfaces for MHL scratchpad commandJungshik Jang2014-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 1. Add sendScratchpadCommand to IHdmiControlService interface, which is used to send scratchpad command. 2. Add IHdmiMhlScratchpadCommandListener to handle incoming MHL scratchpad command. Bug: 17146522 Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15
| * Remove incomplete media router API. (DO NOT MERGE)Jeff Brown2014-08-191-7/+0
|/ | | | Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
* Add callbacks for MediaProjection start / stop.Michael Wright2014-08-171-0/+1
| | | | | | | Also, enforce that there is only one valid MediaProjection at a time. Bug: 16488053 Change-Id: Id05445d798c98cb208bc4dab186296392e15d30b
* Final structural tweaks to Telecomm API (1/8)Ihab Awad2014-08-131-2/+2
| | | | | | Bug: 16416927 Bug: 16494880 Change-Id: I45fbe287c410cbb5e1b985f320b862d732811f43
* Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into ↵Jose Lima2014-08-081-1/+2
|\ | | | | | | lmp-dev
| * Added StatusBarNotification.aidl to frameworks/base/Android.mkJose Lima2014-08-081-1/+2
| | | | | | | | Change-Id: I98fb4821642e3431bb41506de3d8905f90a40729
* | Aidl changes related to VideoCallProvider in Ims.Andrew Lee2014-08-081-0/+2
|/ | | | | | | | | | | | | | | + Added a getVideoCallProvider function in IImsCallSession + Added IImsVideoCallProvider aidl. This is used for communication between Telephony and the ImsService. It is redundant with IVideoCallProvider on some level, but see associated bug and comments in the class for more detail. + Added IImsVideoCallCallback. This is used for communicationing callback invocations from ImsService to Telephony. It is redundant with IVideoCallCallback for same reason in bugs/comments. + Some minor formatting changes. Bug: 16886403 Change-Id: I03de12d4432f837e0930bc077307509b645493e0
* Surface user action events when un/installing.Jeff Sharkey2014-08-071-0/+1
| | | | | | | | This will be used shortly to connect up with permissions confirmation UI. Bug: 16515814 Change-Id: If28cecc28549900d960ac107a1fba0b10ce5bd7b
* Switch from core to core-libartBrian Carlstrom2014-08-051-1/+1
| | | | | | | | Bug: 14298175 (cherry picked from commit dbcae5ceb766b0bc65fa819841f9bfab9ae11c2f) Change-Id: I982d02184b7bfdd14f447e2761fe5d058c53489b
* Add ECBM functionality for IMSUma Maheswari Ramalingam2014-08-031-0/+2
| | | | | | Code for adding ECBM functionality for IMS. Change-Id: I2833c81baf0a55a18ac6433c47fd76bad7cf0ec9
* NFC Unlock api changesAndres Morales2014-07-311-0/+1
| | | | | Bug: 16401635 Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
* Revert "NFC Unlock api changes"Andres Morales2014-07-301-1/+0
| | | | | | This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335. Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
* NFC Unlock api changesAndres Morales2014-07-301-0/+1
| | | | | Bug: 16401635 Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
* Remove DozeHardware since it will not be used.Jeff Brown2014-07-261-1/+0
| | | | | Bug: 16516536 Change-Id: I14597d3c9470c94e3bc5b8cff500d2fe6b2fd977
* PackageInstaller changes based on feedback.Jeff Sharkey2014-07-251-1/+1
| | | | | | | Mostly cosmetic changes from API council feedback. Bug: 16543552 Change-Id: Ic926829b3f77c31f50a899c59b779353daf00d59
* Add VideoCall and VideoCall.Listener as an inner classes of Call.Andrew Lee2014-07-251-2/+2
| | | | | | Bug: 16494880 Bug: 16495203 Change-Id: Ife3b6723374ea5fbbff4927c4f9168d075be21e1