Jeff Sharkey
53d64de0ac
am a475ef57: am 4d700a9c: Merge "PackageInstaller changes based on feedback." into lmp-dev
...
* commit 'a475ef574492142bdfd9c25c93bd1e87cc9c712a':
PackageInstaller changes based on feedback.
2014-07-25 19:19:20 +00:00
Craig Mautner
040491594d
am 053ce1e7: am 40185726: am a9c5257a: am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
...
* commit '053ce1e7a85e3ca7820a3b9e1b2c203d1a1a345b':
Finish crashed activities immediately
2014-07-25 19:18:05 +00:00
Adam Lesinski
54e650196a
am 4d5eda90: am 42460fd6: Add Per-User logging of UsageStats
...
* commit '4d5eda904054382c118622d2d46546189dbbf70b':
Add Per-User logging of UsageStats
2014-07-25 17:27:27 +00:00
Amith Yamasani
7f41be4cac
am f4b195c9: am 1f348428: Merge "Don\'t update user\'s setup state unless it changed" into lmp-dev
...
* commit 'f4b195c9791b6112beb86119a5dd8ab7c55a5201':
Don't update user's setup state unless it changed
2014-07-25 17:12:11 +00:00
Kenny Guy
1d2ea07adc
am 2afedc82: am 0f151df6: Add method to launch settings app details page.
...
* commit '2afedc8225d754f8422c96ae04988d7ce9891aa9':
Add method to launch settings app details page.
2014-07-25 16:06:47 +00:00
Narayan Kamath
288db80e04
am 1f4a1c58: am a589b67f: Merge "Handle apps that share a UID with the system_server correctly." into lmp-dev
...
* commit '1f4a1c5823e11dd48a0d076ab88f33a32aef478a':
Handle apps that share a UID with the system_server correctly.
2014-07-25 14:42:14 +00:00
Narayan Kamath
4e070e33dd
am bbe9386f: am 77075e88: Merge "Handle renderscript apps in the system partition correctly." into lmp-dev
...
* commit 'bbe9386f0f639bde8422c1d02ea9c614cd396117':
Handle renderscript apps in the system partition correctly.
2014-07-25 14:37:59 +00:00
Adrian Roos
7a2cb299a0
am f8a01f5f: am 6468d5c2: Merge "Restart trust agents when updated or when they are dead" into lmp-dev
...
* commit 'f8a01f5f011dc9e1324fc2b54fcf4d9e0695da37':
Restart trust agents when updated or when they are dead
2014-07-25 13:16:13 +00:00
Nicolas Prevot
a8f076e8c3
am e7469eca: am c50bbc02: Merge "Migrate extras to ClipData for image/video capture intents." into lmp-dev
...
* commit 'e7469eca60b76931830e3679788865ee8582add1':
Migrate extras to ClipData for image/video capture intents.
2014-07-25 12:26:24 +00:00
Yuncheol Heo
0e2855ae25
am d40418ce: am 0f5a4415: Merge "Check the validity of the port id of HdmiCecMessage only in TV." into lmp-dev
...
* commit 'd40418ced2a3eaa95d23fce44b32e16a869c6a8a':
Check the validity of the port id of HdmiCecMessage only in TV.
2014-07-25 12:25:36 +00:00
Ji-Hwan Lee
1e9bc752e2
am 260a9884: am 4f2ba445: TIF: Remove ClientState.mInputIds
...
* commit '260a988429d96d466168865b9ec6153d6d669569':
TIF: Remove ClientState.mInputIds
2014-07-25 12:25:32 +00:00
Jinsuk Kim
3d08555ede
Merge "Give clear distinction between active source/active routing path" into lmp-dev
2014-07-25 11:19:20 +00:00
Jinsuk Kim
72b7d738d5
Give clear distinction between active source/active routing path
...
Previously in HdmiControlSerivce, active routing path was mixed with
the physical address of the active source, but these two concepts needs
clearer distinction.
Defined a new variable for active source that contains both logical/physical
address to keep active routing path separate. This change makes it possible
to write the flow more closely to the guideline.
Also added to this CL is flag notifyInputChange, which allows the device/
routing change triggered by external event to trigger InputChangeListener
to get TIF notified. For routing control, the device info passed to TIF
has the path information in the field mPhysicalAddress (other fields are
invalid).
Bug: 16519939
Change-Id: I8b400bc48e874b0866500655773aea38ab945fe4
2014-07-28 14:48:29 +09:00
Jinsuk Kim
45b0ff37f1
am 1e5b3846: am 885c07cf: Merge "Add portID information in HdmiCecDeviceInfo" into lmp-dev
...
* commit '1e5b38464ff3028064d4d04c60d6a030073d9429':
Add portID information in HdmiCecDeviceInfo
2014-07-25 04:12:00 +00:00
Jungshik Jang
eefb303e66
am 5e93d5bd: am d0af31ad: Merge "Replace osd message for record status with IHdmiRecordCallback." into lmp-dev
...
* commit '5e93d5bd9d2331b6b9da03025d9e6634f413acc8':
Replace osd message for record status with IHdmiRecordCallback.
2014-07-25 02:44:10 +00:00
Christopher Tate
1a30f79218
am 2f8686de: am bfe49860: Merge "A couple of restore fixes:" into lmp-dev
...
* commit '2f8686de78c47fd6a0532737ee32deb8d4ea8314':
A couple of restore fixes:
2014-07-25 02:27:36 +00:00
JP Abgrall
7effe8a4f9
am bac1f926: am ff941249: MountService: Fix android.process.media crash repeatedly problem
...
* commit 'bac1f9265c9432d8ae19928e3a353c3864052c04':
MountService: Fix android.process.media crash repeatedly problem
2014-07-25 02:27:32 +00:00
Michael Wright
a74f3e47d7
am 5886d7db: am f5f90d6c: Merge "Flip the permissions checks for video capture." into lmp-dev
...
* commit '5886d7dba5e8542a6fd87083830f65b09b95e82a':
Flip the permissions checks for video capture.
2014-07-25 02:27:27 +00:00
Craig Mautner
078a404587
am 068d3b14: am 89539ae5: Create end of animation callback for Activity
...
* commit '068d3b142f993e80b83752f78dbe74b4c0bd46df':
Create end of animation callback for Activity
2014-07-25 02:27:22 +00:00
Svetoslav
7698cebfc5
am b68f7f89: am eba159ac: Improve the window query API performamce.
...
* commit 'b68f7f89677c3abe578227fffe8b1edf3bdd5636':
Improve the window query API performamce.
2014-07-25 02:27:13 +00:00
Dongwon Kang
10e9796ae9
am e12431bf: am 84745dd1: Merge "Disable TvInputManagerService on non-TV devices." into lmp-dev
...
* commit 'e12431bf0fde0cc9a26c9e501ae665b5b0afa500':
Disable TvInputManagerService on non-TV devices.
2014-07-25 02:26:57 +00:00
Christopher Tate
cb6121dc48
am fcacf679: am 1cf19dc7: Turn on debugging override of idle time
...
* commit 'fcacf679871631ddc16381374becb5213b2ee2df':
Turn on debugging override of idle time
2014-07-25 02:26:44 +00:00
Sreeram Ramachandran
2b1b96ba0f
am 5641181d: am f5aef029: Merge "Don\'t create a ConnectivityManager when the service isn\'t ready yet." into lmp-dev
...
* commit '5641181dbaaad61b5cd584044ae85ccf0d436698':
Don't create a ConnectivityManager when the service isn't ready yet.
2014-07-24 23:46:57 +00:00
Amith Yamasani
2423ad19b9
am 2ec5ef32: am 8fdfdbbb: Call PRE_BOOT_COMPLETED on starting any user
...
* commit '2ec5ef329f6e36a722f3cac1dac380d75889f603':
Call PRE_BOOT_COMPLETED on starting any user
2014-07-24 23:46:35 +00:00
Prashant Malani
8ddba1e8e9
am 992f4dee: am 16d220d9: Merge "resolved conflicts for merge of bc3699b1 to lmp-dev" into lmp-dev
...
* commit '992f4dee4c7e7de7d659129c979187f7e3317607':
Revert "Remove circular mask"
2014-07-24 23:36:50 +00:00
Robert Greenwalt
eeaea4f902
am 142fc0ca: am 457a09d5: Merge "Fix DUN-based tethering." into lmp-dev
...
* commit '142fc0ca3326c87b43f873e0a749be78436aa173':
Fix DUN-based tethering.
2014-07-24 23:35:57 +00:00
Craig Mautner
b33ff85022
am 93853c4c: am b803a2be: Refactor screen blocking logic.
...
* commit '93853c4c341ebdc2a630fe76767cbd5d86c8249e':
Refactor screen blocking logic.
2014-07-24 23:35:02 +00:00
Nicolas Prevot
f2e791fcdd
am 1b4a211d: am 4fe8fe2b: Merge "Making the clipboard work across users." into lmp-dev
...
* commit '1b4a211dc241c8d7275da97980dd6ea843f42933':
Making the clipboard work across users.
2014-07-24 19:49:30 +00:00
Ji-Hwan Lee
a2ccc146ba
am e24b1ccc: am fe199929: Merge "TIF: Handle null main session" into lmp-dev
...
* commit 'e24b1ccc00a79dec8de5d8b7e27477251b2aca02':
TIF: Handle null main session
2014-07-24 19:49:15 +00:00
Ji-Hwan Lee
24445f62f8
am 8207fa19: am f9203497: Merge "TIF: Fix crash on setMainSession" into lmp-dev
...
* commit '8207fa194b9f0e2c126b7ee3978d34ba6ca15192':
TIF: Fix crash on setMainSession
2014-07-24 19:49:07 +00:00
Ji-Hwan Lee
b398259496
am 1bcb91c1: am 22185ce0: TIF: Support HDMI-CEC active source management
...
* commit '1bcb91c19bfdc166ff4cacc1dc1569da5416b3fa':
TIF: Support HDMI-CEC active source management
2014-07-24 19:48:59 +00:00
Terry Heo
b4862fa742
am 6933e350: am f71dcd8e: Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev
...
* commit '6933e350e6eb1f866578e1f588284706b3401894':
TIF: Enable capturing TV input of TvInputPassthroughWrapperService
2014-07-24 19:48:55 +00:00
Antoine Labour
6e753f8087
am f6ec140a: am 4a35f41a: Merge "WindowManager: fix clipping" into lmp-dev
...
* commit 'f6ec140ad67263061c6c9236e1c117c75c1a6dc0':
WindowManager: fix clipping
2014-07-24 19:48:50 +00:00
Jungshik Jang
a81ca12dc3
am 13dcf17a: am 3b4dcfa8: Implement OneTouchRecordAction and stop one touch record.
...
* commit '13dcf17a859bb88569dc93287d69054d213a3e89':
Implement OneTouchRecordAction and stop one touch record.
2014-07-24 19:48:03 +00:00
Terry Heo
8934fd5d64
am 5d41a6b0: am 4d85b87c: Merge "Add a frame capture API of TV input" into lmp-dev
...
* commit '5d41a6b0ca5f44d7eeca9d853a468a3a899f0c49':
Add a frame capture API of TV input
2014-07-24 19:47:35 +00:00
Geoffrey Borggaard
832f82f9eb
am 1b09c716: am d07b648b: Merge "Fixes setting password through DevicePolicyManager" into lmp-dev
...
* commit '1b09c716096ccada799c6fde6cb397b3e307b709':
Fixes setting password through DevicePolicyManager
2014-07-24 19:46:46 +00:00
Matthew Williams
7d1081531d
am 083e4b24: am 0e61a7c0: Merge "Fix JobScheduler race condition" into lmp-dev
...
* commit '083e4b24c978e380e6a7c864a00257f585eb51c7':
Fix JobScheduler race condition
2014-07-24 19:46:20 +00:00
John Spurlock
d90cd59507
Merge "Zen: Remove hardcoded package name filters." into lmp-dev
2014-07-24 15:37:54 +00:00
John Spurlock
c54459fb94
Zen: Remove hardcoded package name filters.
...
Bug:15474885
Change-Id: I282cc3d597b2a8855bcb4e987a11cea04f956bad
2014-07-27 11:19:38 -04:00
John Spurlock
cad5768e22
Doze: Update tease signal to buzz-beep-blink from NoMan.
...
Inform SystemUI when NoMan buzzes, beeps or blinks. Use that
as the notification signal when dozing instead of trying to figure
out interesting panel content updates.
At some point, we should move the entire calculation up into SystemUI
itself, but that's too large of a refactoring to perform now.
Bug:15863249
Change-Id: I40e92334977e0676a1363774c2cbbf91d72ec8e5
2014-07-26 17:09:56 -04:00
Adam Lesinski
a7fa6a27c2
am 081a7ac6: am 4d5eda90: am 42460fd6: Add Per-User logging of UsageStats
...
* commit '081a7ac698372147ff472935febc7fac484a3879':
Add Per-User logging of UsageStats
2014-07-25 17:34:07 +00:00
Amith Yamasani
234db99c41
am 74b17693: am f4b195c9: am 1f348428: Merge "Don\'t update user\'s setup state unless it changed" into lmp-dev
...
* commit '74b17693540dd75d1d3a1603326593efdb67f5fb':
Don't update user's setup state unless it changed
2014-07-25 17:17:29 +00:00
Kenny Guy
b7aa6b22b2
am 5984703a: am 2afedc82: am 0f151df6: Add method to launch settings app details page.
...
* commit '5984703aed48789a7aaa6dd0d1dd55a288f7529a':
Add method to launch settings app details page.
2014-07-25 16:11:16 +00:00
Narayan Kamath
198c47b054
am 280023dd: am 1f4a1c58: am a589b67f: Merge "Handle apps that share a UID with the system_server correctly." into lmp-dev
...
* commit '280023dd0fab4ea915a298046d570708783b9780':
Handle apps that share a UID with the system_server correctly.
2014-07-25 14:45:28 +00:00
Narayan Kamath
390dfc160d
am faa2243f: am bbe9386f: am 77075e88: Merge "Handle renderscript apps in the system partition correctly." into lmp-dev
...
* commit 'faa2243f6965319e743d6e438235d59cba0aab09':
Handle renderscript apps in the system partition correctly.
2014-07-25 14:41:26 +00:00
Adrian Roos
b42fe576f6
am 5de758d3: am f8a01f5f: am 6468d5c2: Merge "Restart trust agents when updated or when they are dead" into lmp-dev
...
* commit '5de758d3868b036f5067ad9f86ee7b02331e4818':
Restart trust agents when updated or when they are dead
2014-07-25 13:22:38 +00:00
Nicolas Prevot
73b941f761
am c5435cdd: am e7469eca: am c50bbc02: Merge "Migrate extras to ClipData for image/video capture intents." into lmp-dev
...
* commit 'c5435cdd91f6778d753f99ee6ee8c5132e0ae962':
Migrate extras to ClipData for image/video capture intents.
2014-07-25 12:38:32 +00:00
Yuncheol Heo
20c8e702d4
am 6eea71e1: am d40418ce: am 0f5a4415: Merge "Check the validity of the port id of HdmiCecMessage only in TV." into lmp-dev
...
* commit '6eea71e1083a3fad3d08d961cd0343bc3380e75e':
Check the validity of the port id of HdmiCecMessage only in TV.
2014-07-25 12:38:19 +00:00
Ji-Hwan Lee
6883282c5e
am 05c76f4d: am 260a9884: am 4f2ba445: TIF: Remove ClientState.mInputIds
...
* commit '05c76f4d8412d8347b3b09d6ac66087507e8f885':
TIF: Remove ClientState.mInputIds
2014-07-25 12:38:14 +00:00
Jinsuk Kim
8419e0e0af
am 9b362265: am 1e5b3846: am 885c07cf: Merge "Add portID information in HdmiCecDeviceInfo" into lmp-dev
...
* commit '9b3622659f0981dcf355134921630a4f26116f32':
Add portID information in HdmiCecDeviceInfo
2014-07-25 11:54:16 +00:00