summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" ↵Dianne Hackborn2015-06-085-11/+11
|\ | | | | | | into mnc-dev
| * Fix issue #21572679: API Review: ActivityOptions, usage time reportDianne Hackborn2015-06-055-11/+11
| | | | | | | | Change-Id: I62751e93e39f90d5d2ec725586880724f3edbbc7
* | Merge "MidiManager: proxy all requests to open devices through MidiService" ↵Mike Lockwood2015-06-0816-174/+520
|\ \ | | | | | | | | | into mnc-dev
| * | MidiManager: proxy all requests to open devices through MidiServiceMike Lockwood2015-06-0416-174/+520
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when a MidiManager client opened a virtual or Bluetooth device, the client bound directly to the virtual device's MidiDeviceService or BluetoothMidiDevice's IMidiDeviceServer for the given BluetoothDevice. Only USB devices were opened in MidiService. Now opening any type of MIDI device is done via IMidiManager.openDevice() or IMidiManager.openBluetoothDevice(). MidiService tracks all connnections between clients and devices. Services that implement virtual devices must now require android.permission.BIND_MIDI_DEVICE_SERVICE so only MidiService can bind to these services. Bug: 21044677 Change-Id: I7172f7b1e0cbfe4a2a87dff376c32dc9b41aa563
* | | Improve string comment.Makoto Onuki2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | Bug 21685729 Change-Id: If6c79730778f399ed0dbf500ef62df3150fbaea6
* | | Hide top and bottom bar while dozingJorim Jaggi2015-06-081-0/+7
| | | | | | | | | | | | | | | Bug: 18903923 Change-Id: I7b222f9dd168101084f3ee4cbbe6f9495818eab4
* | | Merge "Add SYSTEM_DIR check to upgrade-key-set verification." into mnc-devdcashman2015-06-081-3/+10
|\ \ \
| * | | Add SYSTEM_DIR check to upgrade-key-set verification.dcashman2015-06-081-3/+10
| | | | | | | | | | | | | | | | | | | | Bug: 21697139 Change-Id: I7e6ce3d7f231e0ca5da1f501c80342a04f6c2a1e
* | | | Merge "Remove deprecated android.security.KeyStore methods." into mnc-devAlex Klyubin2015-06-086-45/+45
|\ \ \ \
| * | | | Remove deprecated android.security.KeyStore methods.Alex Klyubin2015-06-086-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * delKey -> delete * getPubkey -> exportKey * saw -> list. Bug: 18088752 Change-Id: Ifb794f91a42646d67da1340ee16765cbaf255a49
* | | | | Merge "RSA encrypt with private key in Android Keystore." into mnc-devAlex Klyubin2015-06-082-12/+85
|\ \ \ \ \
| * | | | | RSA encrypt with private key in Android Keystore.Alex Klyubin2015-06-042-12/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for RSA encryption using private key and no padding. This mode of operation is needed because JCA does not offer an RSA Signature primitive that does not apply padding. Bug: 18088752 Bug: 20912868 Change-Id: I0b481b4c19916f601aa270fada5eabfb12987e8d
* | | | | | Merge "Disable -Werror on Clang" into mnc-devJohn Reck2015-06-081-1/+5
|\ \ \ \ \ \
| * | | | | | Disable -Werror on ClangJohn Reck2015-06-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21698669 Change-Id: I90549599ed52cff028a29f56d3d8ffe80c9afab4
* | | | | | | Merge "Fix clang warnings" into mnc-devJohn Reck2015-06-081-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix clang warningsJohn Reck2015-06-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21695880 Change-Id: I2985a42a52ab27c546b4317ea70f94d1506c5347
* | | | | | | | Merge "Include launched packageName in systrace." into mnc-devWale Ogunwale2015-06-082-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Include launched packageName in systrace.Narayan Kamath2015-06-082-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to tell which package the activity manager is launching. The downside here is that each launch shows up in a separate row in the systrace, but this matches up with the "Start proc:" label, which contains the package name as well and makes it easier to inspect both simultaneously. bug: 21632700 Change-Id: I20ebc2f2a2cf0dc74c6d7daa4bafa381ae4c4060
* | | | | | | | | Merge "Wait for wakeup_reasons on first init" into mnc-devAdam Lesinski2015-06-081-19/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Wait for wakeup_reasons on first initAdam Lesinski2015-06-051-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if we were initializing the wakeup callback for the first time, we would read the wakeup_reason file and ignore the contents, sending a wakeup_reason of "unknown" up to BatteryStats. Now we initialize the callback and wait on it immediately. Wakeup reasons are reset when we go into sleep, so when we wakeup, we will always have fresh wakeup reasons. Bug:21665793 Change-Id: I20832d8a143fc2715915fcecf4bb71980f279440
* | | | | | | | | | Merge "Revert "Print exception stacktrace on failed scanPackageLI"" into mnc-devDimitry Ivanov2015-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Print exception stacktrace on failed scanPackageLI"Dimitry Ivanov2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 95b7d50ce1a1ae879bbb1b8b8262172744c28d0e. Bug: 8076853 Change-Id: Ia19e6638a97b7b49561932752a204990e3a486d4
* | | | | | | | | | | Merge "Adding temporary logging to debug CTS failure (for ↵Amit Mahajan2015-06-081-3/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CellLocationTest)." into mnc-dev
| * | | | | | | | | | | Adding temporary logging to debug CTS failure (for CellLocationTest).Amit Mahajan2015-06-031-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21209629 Change-Id: Ic99cf02f26d3cca7260a3a0141ce13eff9a885bc
* | | | | | | | | | | | Merge "Changing getSimState to use slot idx instead of sub id." into mnc-devAmit Mahajan2015-06-083-14/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Changing getSimState to use slot idx instead of sub id.Amit Mahajan2015-06-083-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20736251 Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
* | | | | | | | | | | | | Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-devAndrew Flynn2015-06-084-38/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | notifyCarrierNetworkChange:TelephonyManager->CarrierServiceAndrew Flynn2015-06-054-38/+47
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per API review, move TelephonyManager.notifyCarrierNetworkChange() to CarrierService.notifyCarrierNetworkChange(). Underlying telephony implementation remains unchanged. Also minor tweaks to CarrierService: * Remove some unnecessary @hide * Remove final qualifier from onBind() so that subclasses can handle new internal callers that want to bind to it. Bug: 21572049 Bug: 21630803 Change-Id: Idcbcd107966fe92d7edc23c261e11db61160f615
* | | | | | | | | | | | | Merge "Release voice wake lock at end of voice interaction session" into mnc-devWale Ogunwale2015-06-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Release voice wake lock at end of voice interaction sessionWale Ogunwale2015-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21615776 Bug: 21615761 Change-Id: I75d568474d4df5f21ea5b616887c6187e54f69e7
* | | | | | | | | | | | | API review: Update hasMic to hasMicrophone.Tim Kilbourn2015-06-084-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make the SearchEvent constructor available for testing. Bug: 21572283 Bug: 21572676 Change-Id: I35cfd88b45aeb97b6ccf83aeb46b0ecc4bbc0947
* | | | | | | | | | | | | Merge "Remove insertion action mode runnable on selection start" into mnc-devClara Bayarri2015-06-081-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove insertion action mode runnable on selection startClara Bayarri2015-06-081-4/+3
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was in a previous change and accidentally got reverted on a rebase. When going from an Insertion to a Selection/Drag Mode we want to make sure no insertion modes are started by pending requests. Previous change with accidental rebase: I91bcd0d9c3e68d9c736698fe0bec010b4c9f5cf3 Bug: 21647271 Change-Id: I32c152494d236b693a489ea97448904163c9620a
* | | | | | | | | | | | | Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" ↵Wale Ogunwale2015-06-081-13/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | Hold service lock when AMS.setProcessMemoryTrimLevel() is calledWale Ogunwale2015-06-081-13/+15
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21633189 Change-Id: I7203807466593ced6ec3dd328c1a03532caf3a31
* | | | | | | | | | | | | Merge "Pass an args bundle to launchAssistAction." into mnc-devTim Kilbourn2015-06-0811-36/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Pass an args bundle to launchAssistAction.Tim Kilbourn2015-06-0511-38/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to track the input device that was used to trigger assist, the input device id is sent as an extra in the assist intent whenever it is available. This is particularly useful on TVs, when an app may want to know whether the input device has a microphone. Bug: 21666123 Change-Id: I0f8c09e2f617606bef481bdff924cb6b9b47dd12
* | | | | | | | | | | | | | Merge "Zen: New user flow for requesting DND access." into mnc-devJohn Spurlock2015-06-0810-133/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Zen: New user flow for requesting DND access.John Spurlock2015-06-0810-133/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - User flow is now similar to requesting access to notification content, namely prompting the user to visit a settings page for enabling/disabling apps access. - New ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED intent for apps to listen to this state change. - Removed obsolete request method and associated internal callback aidl. - Added new android.permission.ACCESS_NOTIFICATION_POLICY permission for apps to include as a signal that they want to request this access (and therefore appear in the list on the settings page). - Improve javadocs, outline the user flow in NotificationManager#isNotificationPolicyAccessGranted and link to this method elsewhere. - NoManService now persists the user-enabled package list across reboots and does so per-user. - Rename public settings intent to correspond with the noman api. Bug: 21621663 Change-Id: I72cbc21cd736e6a157b6be5d1d0ba0b4a8e7ef4e
* | | | | | | | | | | | | | | Merge "API Council changes." into mnc-devGeorge Mount2015-06-084-20/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | API Council changes.George Mount2015-06-054-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 21571897 Change-Id: I681096c50a6f4a448e399b482742efc06229fab1
* | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-0877-473/+449
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-473/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a957f296d911b43158459c0a27e8b8cb1408a03 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | Merge "Add telecom extra to specify handle for incoming call" into mnc-devYorke Lee2015-06-083-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add telecom extra to specify handle for incoming callYorke Lee2015-06-053-0/+9
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19696065 Change-Id: Ie7c9e3f982808abd4944cfa7bd3c754b93479f84
* | | | | | | | | | | | | | | | Merge "Change stylus button press to context click in View - API review ↵Mady Mellor2015-06-0814-157/+155
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feedback" into mnc-dev
| * | | | | | | | | | | | | | | | Change stylus button press to context click in View - API review feedbackMady Mellor2015-06-0514-157/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates all references in View's onStylusButtonPress to onContextClick as per API review feedback. Additionally listens for mouse right clicks and calls the onContextClick method for these as well for the stylus button press. Bug: 21572278 Change-Id: I5c1ee8c8f23a77d7c677b86356e89d0e4fc40056
* | | | | | | | | | | | | | | | | Merge "Change stylus button press to context click in GD - API review ↵Mady Mellor2015-06-083-49/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feedback" into mnc-dev
| * | | | | | | | | | | | | | | | | Change stylus button press to context click in GD - API review feedbackMady Mellor2015-06-053-49/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on API review feedback we should use onContextClick instead of onStylusButtonPress. This CL updates associated methods and usage in GestureDetector. Additionally listens for mouse right clicks and calls the onContextClick method for these as well. Bug: 21572278 Change-Id: I4fa01997bff7265d5d2713353a93e07417a148e5
* | | | | | | | | | | | | | | | | | Merge "instrument emergency call button" into mnc-devChris Wren2015-06-082-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-07 06:46:55 +0000