summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Allow VPNs to add/remove link addresses dynamically.Sreeram Ramachandran2014-07-294-2/+113
| | | | | Bug: 15409819 Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
* Provide outside-facing API for data management intent+labelChristopher Tate2014-07-281-0/+44
| | | | | | Bug 16346320 Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
* Merge "Add MHL getPortInfo" into lmp-devJinsuk Kim2014-07-241-20/+21
|\
| * Add MHL getPortInfoJinsuk Kim2014-07-281-20/+21
| | | | | | | | | | | | | | Allows MHL support flag to be put into port information Bug: 16215362 Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
* | Remove dead code 2.Robert Greenwalt2014-07-282-326/+143
| | | | | | | | | | | | | | | | Removing ConnectivityService.NetworkFactory. This requires disabling the ConnectivityServiceTest, but that's been broken since we stopped using NetworkStateTrackers anyway. Change-Id: I9b86bd37eb9d018c40f60dca5b00d62c36d4e3ad
* | Make returning ActivityOptions part of ActivityRecord.George Mount2014-07-283-13/+13
| | | | | | | | | | | | | | | | | | | | | | Bug 16626030 Getting the timing correct for when to clear returning activity options was difficult when Activities can be destroyed and recreated. Moving the returning ActivityOptions to the ActivityRecord forces the ActivityOptions to only apply to the correct Activity. Change-Id: Ib5400b157eb741ae484aae0cc83172a3db637a3e
* | Merge "Remove dead code 1." into lmp-devRobert Greenwalt2014-07-241-370/+27
|\ \
| * | Remove dead code 1.Robert Greenwalt2014-07-281-370/+27
| | | | | | | | | | | | | | | | | | | | | Starting with startUsingNetworkFeature and stop. Figure it's easier to code review incremental changes. Change-Id: I19aee65e740858c3a9a2a1a785663f6fee094334
* | | Prohibit address families by default unless a VPN explicitly allows them.Sreeram Ramachandran2014-07-283-6/+106
| | | | | | | | | | | | | | | Bug: 15972465 Change-Id: I3278d94536fefacc86390c1ba4231680f7be8589
* | | Use blob (shared memory) for large data in sound model/recognition event/configSandeep Siddhartha2014-07-281-9/+2
|/ / | | | | | | | | | | | | Also add a missing null check in writeBlob Bug: 16516353 Change-Id: Ie702f8daae541cab7c2cee6e13d49e7fc84c84e1
* | Merge changes I87f551a7,Icb8dc76c,I66fbf585,I0c9506e7 into lmp-devRoboErik2014-07-252-56/+108
|\ \ | | | | | | | | | | | | | | | | | | | | | * changes: Add context to MediaController constructor Add getPackageName to MediaController Expose a way to set a PendingIntent for restarting playback Finish plumbing for launch intents in sessions
| * | Add getPackageName to MediaControllerRoboErik2014-07-252-19/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the MediaSessionInfo class and adds a method on the controller to get the package name. This also converts code that depended on the session's UUID to use the token for comparison or the Tag in the case of test code that needs a string identifier. Change-Id: Icb8dc76c70e23e897da8fd07651c524b96372bf9
| * | Expose a way to set a PendingIntent for restarting playbackRoboErik2014-07-252-37/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to allow apps to set a PendingIntent to restart playback. This is not persisted across reboots but will allow music to start playing again for the life of the system. Only the most recent priority app with a PI set will be cached. This also deprecates methods in AudioManager that do this and unhides the unregister method in MediaSessionManager. Change-Id: I66fbf5856333468d8cb8a3022809778ba00d426e
| * | Finish plumbing for launch intents in sessionsRoboErik2014-07-251-0/+12
| | | | | | | | | | | | | | | | | | | | | This finishes out the plumbing for setting a launchable PendingIntent on a session and getting it from a controller to launch an app's UI. Change-Id: I0c9506e7c3f0ebf57070ca7e0d91324eb3fdd1e1
* | | Enable RTT End-to-endVinit Deshpande2014-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This change includes various fixes to first RTT implementation and enables RTT APIs end-to-end. Fixes include proper marshalling of objects across API and service and JNI fixes. Change-Id: Ie4ba1ffc6c5b42593e931438b3f03e201ff6be71
* | | Merge "Remove the profile/device owner user restriction bypass." into lmp-devJulia Reynolds2014-07-242-80/+2
|\ \ \
| * | | Remove the profile/device owner user restriction bypass.Julia Reynolds2014-07-262-80/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 16566096 Change-Id: I4a56046df44d36d82edc64fc727e8cad5dc75382
* | | | Merge "Fix status icon reappearing for legacy activities" into lmp-devJorim Jaggi2014-07-243-6/+24
|\ \ \ \
| * \ \ \ am a01d3aa4: am 7baf28e3: am 1c937d63: Merge "Give clear distinction between ↵Jinsuk Kim2014-07-287-76/+154
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | active source/active routing path" into lmp-dev * commit 'a01d3aa48cc1614e9d7c15c293efcf493eecf31a': Give clear distinction between active source/active routing path
| | * \ \ \ am 7baf28e3: am 1c937d63: Merge "Give clear distinction between active ↵Jinsuk Kim2014-07-287-76/+154
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | source/active routing path" into lmp-dev * commit '7baf28e39e8ab8ebcb03390bee2b42ff9bdab78e': Give clear distinction between active source/active routing path
| * | \ \ \ \ am 8ac64af6: am 9cd88b91: am 7c98ecd3: Schedule full backupsChristopher Tate2014-07-283-95/+545
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8ac64af6236b03e0af6ee95bd579612a6d1ef4d4': Schedule full backups
| | * | | | | am 9cd88b91: am 7c98ecd3: Schedule full backupsChristopher Tate2014-07-283-95/+545
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9cd88b9105742ffa15584183d3b3337d98f750be': Schedule full backups
| * | \ \ \ \ \ am 501cdb21: am 3efb37d2: am 636e6b73: Minor tweak to screen dimming policy.Jeff Brown2014-07-271-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '501cdb21024050ec44ef9fbfcf8c4ce0a248666a': Minor tweak to screen dimming policy.
| | * | | | | | am 3efb37d2: am 636e6b73: Minor tweak to screen dimming policy.Jeff Brown2014-07-271-2/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3efb37d23c14682b2958399ac05332e6eee2cdc2': Minor tweak to screen dimming policy.
| * | \ \ \ \ \ \ am 15ab3fab: am ea444fe7: am 0280963e: Move Alarm setup to systemReady.Robert Greenwalt2014-07-271-6/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15ab3fabac91e64cf4ef13fb6060882e4d94c533': Move Alarm setup to systemReady.
| | * | | | | | | am ea444fe7: am 0280963e: Move Alarm setup to systemReady.Robert Greenwalt2014-07-271-6/+8
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea444fe795e00f793dda5e380e55beb178e83ef7': Move Alarm setup to systemReady.
| * | \ \ \ \ \ \ \ am f11f938f: am 7ad3fea6: am 80be3129: Handle special users in default app ↵John Spurlock2014-07-271-1/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check. * commit 'f11f938fa4be5a326b29975e60d53b6565711720': Handle special users in default app check.
| | * | | | | | | | am 7ad3fea6: am 80be3129: Handle special users in default app check.John Spurlock2014-07-271-1/+4
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ad3fea65b792b20870bb60052c405582b8f7b0d': Handle special users in default app check.
| * | \ \ \ \ \ \ \ \ am 022adc96: am 7618c339: am c52817e9: Fix issues with noticing that a VPN ↵Sreeram Ramachandran2014-07-271-3/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface is gone. * commit '022adc9668b8dee2e05738a3cedfeafa6a2835b8': Fix issues with noticing that a VPN interface is gone.
| | * | | | | | | | | am 7618c339: am c52817e9: Fix issues with noticing that a VPN interface is gone.Sreeram Ramachandran2014-07-271-3/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7618c3396e7d047117528fd9aea06eca6dbae71c': Fix issues with noticing that a VPN interface is gone.
| * | \ \ \ \ \ \ \ \ \ am d1518fe6: am 592226f6: am e6de13b1: Merge "Zen: Remove hardcoded package ↵John Spurlock2014-07-272-20/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name filters." into lmp-dev * commit 'd1518fe697c71c321a550ce847772bdcc0014177': Zen: Remove hardcoded package name filters.
| | * | | | | | | | | | am 592226f6: am e6de13b1: Merge "Zen: Remove hardcoded package name ↵John Spurlock2014-07-272-20/+18
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filters." into lmp-dev * commit '592226f656da40d795523ef4cf46f90b26f0ce40': Zen: Remove hardcoded package name filters.
| * | \ \ \ \ \ \ \ \ \ \ am 21f9be76: am 70d5a344: am 3a9bab72: Change TelephonyRegistry to use ↵Wink Saville2014-07-271-42/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phoneId as a callback condition. * commit '21f9be768e5d98f7f2081540c7029e7e9b71f705': Change TelephonyRegistry to use phoneId as a callback condition.
| | * | | | | | | | | | | am 70d5a344: am 3a9bab72: Change TelephonyRegistry to use phoneId as a ↵Wink Saville2014-07-271-42/+88
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callback condition. * commit '70d5a344499c25ef23540061e8b4a08d5abb4b70': Change TelephonyRegistry to use phoneId as a callback condition.
| * | \ \ \ \ \ \ \ \ \ \ \ am 8bfbd2f6: am 7798e931: am 108f9dc2: Merge "Remove DozeHardware since it ↵Jeff Brown2014-07-265-225/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will not be used." into lmp-dev * commit '8bfbd2f61ffb8cc9e167b45ae0306f05af54d10d': Remove DozeHardware since it will not be used.
| | * | | | | | | | | | | | am 7798e931: am 108f9dc2: Merge "Remove DozeHardware since it will not be ↵Jeff Brown2014-07-265-225/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used." into lmp-dev * commit '7798e9313106abfcc39808108b35edc2493ebc6a': Remove DozeHardware since it will not be used.
| * | \ \ \ \ \ \ \ \ \ \ \ \ am 382300fd: am 8ebe80a3: am c9dfaff7: Merge "Doze: Update tease signal to ↵John Spurlock2014-07-263-3/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buzz-beep-blink from NoMan." into lmp-dev * commit '382300fd23cda23040c97f2255edb5d6d351b019': Doze: Update tease signal to buzz-beep-blink from NoMan.
| | * | | | | | | | | | | | | am 8ebe80a3: am c9dfaff7: Merge "Doze: Update tease signal to ↵John Spurlock2014-07-263-3/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buzz-beep-blink from NoMan." into lmp-dev * commit '8ebe80a3919861e36988f91ef95be2efb4e5836d': Doze: Update tease signal to buzz-beep-blink from NoMan.
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ am ff415ca8: am d2d80f2e: am 8944771f: Merge "Fix a deadlock due to AMS ↵Jeff Brown2014-07-262-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calling into WMS with its lock held." into lmp-dev * commit 'ff415ca830964a86399df19968dd2bceff275359': Fix a deadlock due to AMS calling into WMS with its lock held.
| | * | | | | | | | | | | | | | am d2d80f2e: am 8944771f: Merge "Fix a deadlock due to AMS calling into WMS ↵Jeff Brown2014-07-262-1/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with its lock held." into lmp-dev * commit 'd2d80f2e401a06564cb03b649582f74c41e1337b': Fix a deadlock due to AMS calling into WMS with its lock held.
| * | | | | | | | | | | | | | | am c1d00de0: am 32019e7e: am dab2b29b: Merge "Don\'t suppress haptic ↵Jeff Brown2014-07-261-2/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feedback on keyguard anymore." into lmp-dev * commit 'c1d00de01b5904a6c6e3e5b6160b0b7e628bd880': Don't suppress haptic feedback on keyguard anymore.
| | * | | | | | | | | | | | | | am 32019e7e: am dab2b29b: Merge "Don\'t suppress haptic feedback on keyguard ↵Jeff Brown2014-07-261-2/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anymore." into lmp-dev * commit '32019e7e463565977bd29715e4a9e357c61d8a29': Don't suppress haptic feedback on keyguard anymore.
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7ea51115: am e4160d70: am 9c5d5ad9: TIF: Fix invalid use of ↵Ji-Hwan Lee2014-07-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | serviceStateMap.get() * commit '7ea51115e98550cc9119187f02daa1a98ae9cd42': TIF: Fix invalid use of serviceStateMap.get()
| | * | | | | | | | | | | | | | | am e4160d70: am 9c5d5ad9: TIF: Fix invalid use of serviceStateMap.get()Ji-Hwan Lee2014-07-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4160d70c64632bcb4394ff94b67f13738e63072': TIF: Fix invalid use of serviceStateMap.get()
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4c96adaa: am 678883cc: am 5940eb3a: Fix various bugs with model managementSandeep Siddhartha2014-07-263-187/+179
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c96adaa1ec3c225fc7e57078787d88709456914': Fix various bugs with model management
| | * | | | | | | | | | | | | | | | am 678883cc: am 5940eb3a: Fix various bugs with model managementSandeep Siddhartha2014-07-263-187/+179
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '678883cc235ea0a69be96ff988b26d0c92203022': Fix various bugs with model management
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 98eacf02: am 12f642cf: am 5bd81570: TIF: Rename ComponentName variables ↵Ji-Hwan Lee2014-07-251-44/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to "component" consistently * commit '98eacf02f42ac0b1a6b933d80af2d63b72f4ef68': TIF: Rename ComponentName variables to "component" consistently
| | * | | | | | | | | | | | | | | | | am 12f642cf: am 5bd81570: TIF: Rename ComponentName variables to "component" ↵Ji-Hwan Lee2014-07-251-44/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistently * commit '12f642cf1ed42f3c30375ba33925c3b174bc6530': TIF: Rename ComponentName variables to "component" consistently
| * | | | | | | | | | | | | | | | | | am 2b08afab: am 46d2cb78: am 20f25011: Merge "MHL controller for subcommand ↵Jinsuk Kim2014-07-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reception" into lmp-dev * commit '2b08afabfcb6f09c732a3a6a36d550b1ba4d2742': MHL controller for subcommand reception
| | * | | | | | | | | | | | | | | | | am 46d2cb78: am 20f25011: Merge "MHL controller for subcommand reception" ↵Jinsuk Kim2014-07-251-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '46d2cb7870682ee3feb99006b340e2fbfded12d2': MHL controller for subcommand reception