Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
145,340 Commits 3 Branches 0 Tags
3eaf05593bbcfde3ca6040538f61d05abfd885d0
Commit Graph

145340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
3eaf05593b am fc4bbebd: am 6cfa6b5b: am e2894174: Camera2: Fix callback operation 
* commit 'fc4bbebdc5e35c1f5c932e1b6d9b266f68d6ce28':
  Camera2: Fix callback operation
 2014-07-23 19:28:00 +00:00
Craig Mautner
8b0c934092 am 79c98fb1: am 41505285: am 59f55203: Disable back button goes to recents behavior 
* commit '79c98fb136ca0b17250302f2e3b600d0ee129d92':
  Disable back button goes to recents behavior
 2014-07-23 19:23:55 +00:00
Eino-Ville Talvala
9630b94a69 am 6cfa6b5b: am e2894174: Camera2: Fix callback operation 
* commit '6cfa6b5b1ca3ecab93337835792f2afb71613d5a':
  Camera2: Fix callback operation
 2014-07-23 19:23:47 +00:00
Eino-Ville Talvala
a2a045cab8 am e2894174: Camera2: Fix callback operation 
* commit 'e289417427410e5892e252ac08d3b9569a68a21c':
  Camera2: Fix callback operation
 2014-07-23 19:19:41 +00:00
Craig Mautner
699a295bb8 am 41505285: am 59f55203: Disable back button goes to recents behavior 
* commit '41505285136f349f281df0dade79f17b353971ff':
  Disable back button goes to recents behavior
 2014-07-23 19:19:38 +00:00
Craig Mautner
970c649ad8 am 59f55203: Disable back button goes to recents behavior 
* commit '59f55203974be24596d2c2c4ca441e61a9ede963':
  Disable back button goes to recents behavior
 2014-07-23 19:15:30 +00:00
Eino-Ville Talvala
2f75e7d7ef Camera2: Fix callback operation 
- Remove CloseableLock use; looks to be incompatible with invocations during callbacks
- Replace with basic interface lock to be thread-safe
- Add intermediate callback thread to legacy mode to match cross-process one-way Binder
  semantics

Change-Id: Iecd4ff6cf260c5a13bd11b850177ccea93e25933
 2014-07-23 19:14:10 +00:00
Prerepa Viswanadham
6ef301dbc5 am e2983f8c: am bdbd1b3b: am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
* commit 'e2983f8c83b0ce2f067322b07cf10c735cb044e8':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
 2014-07-23 19:12:23 +00:00
Ye Wen
ec0fe24937 am 1a9a6cef: am dbbd116c: am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 
* commit '1a9a6cefcb5f79a3421eac3a62d212c34ca2e75d':
  Infer legacy network type for ConnectivityManager.requestNetwork
 2014-07-23 19:12:19 +00:00
Prerepa Viswanadham
eaae99f288 am bdbd1b3b: am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
* commit 'bdbd1b3b6ba06e2c52ce375e4221df4853e88319':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
 2014-07-23 19:05:44 +00:00
Ye Wen
bb1c3eeafe am dbbd116c: am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 
* commit 'dbbd116c9d1e67b67213e2be14f0198cf6e1b524':
  Infer legacy network type for ConnectivityManager.requestNetwork
 2014-07-23 19:05:41 +00:00
Jason Monk
021fa35d2f am 06bbb1e7: am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev 
* commit '06bbb1e71e17151b1de7827c9c59c8a14f00d87c':
  Make the 'locked' lock task not lock keyguard on exit
 2014-07-23 19:00:15 +00:00
Prerepa Viswanadham
4e6867273a am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
* commit '244c2f47afa12e0d30918522ef8577f4a931623b':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
 2014-07-23 18:59:35 +00:00
Ye Wen
38a8ec0db3 am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 
* commit 'a7d1baac96f73a64aa6e76a494724c2ed29a5456':
  Infer legacy network type for ConnectivityManager.requestNetwork
 2014-07-23 18:59:30 +00:00
Craig Mautner
0b633fc121 Disable back button goes to recents behavior 
Using a static final boolean to do this so if policy is changed it
can be enabled easily.

Also fix fetching task from wrong list. Was causing
ActivityNotFoundExceptions.

Fixes bug 16512561.

Change-Id: I9b47a86fd740d45104aa14712e71df830218c5a7
 2014-07-23 18:58:08 +00:00
Jason Monk
a979c5573b am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev 
* commit '01f4253b2d2d6e8e198f0adc57c9eb73ce8c136f':
  Make the 'locked' lock task not lock keyguard on exit
 2014-07-23 18:56:27 +00:00
Prerepa Viswanadham
8caac741a0 Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
Change-Id: I66fd83d8d59fbd93dec8886dfd313a81575e38a5
 2014-07-23 18:54:46 +00:00
Jason Monk
a6de67773b am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev 
* commit '7143b71c9daf0ed4e73eabd190a445f14d9eafc0':
  Make the 'locked' lock task not lock keyguard on exit
 2014-07-23 18:51:26 +00:00
Sunny Goyal
a9f68c9a99 Merge "Fixing memory leak in WallpaperCropActivity" 2014-07-23 18:50:38 +00:00
Wei Wang
11dfc508d7 am 386deb92: am 03aeeb29: am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 
* commit '386deb926ca8309d1486b8b61f825710be9cbcef':
  Fix parcel issues with empty service uuid. Added tests.
 2014-07-23 18:54:04 +00:00
Wei Wang
4f22c47d87 am 03aeeb29: am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 
* commit '03aeeb294657a616710aca3ff8e1ca5080a1b67b':
  Fix parcel issues with empty service uuid. Added tests.
 2014-07-23 18:50:00 +00:00
Wei Wang
7c7c448499 am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 
* commit '6d630c7575f9e33632acf398201ae4226ce800ed':
  Fix parcel issues with empty service uuid. Added tests.
 2014-07-23 18:47:10 +00:00
Jason Monk
8ed4d5ac66 Merge "Make the 'locked' lock task not lock keyguard on exit" into lmp-dev 2014-07-23 18:38:23 +00:00
Alan Viverette
bbe0dfcbb8 am c4ddf36d: am b1e9a890: am cc379868: Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev 
* commit 'c4ddf36d0cc7f66770ef4fe3277de5aceaccccd9':
  Ensure ripple mask gets updated in public constructor
 2014-07-23 18:37:57 +00:00
Alan Viverette
3f5c0f942f am b1e9a890: am cc379868: Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev 
* commit 'b1e9a890a167cc63aa5bd4656a6643bb41addc73':
  Ensure ripple mask gets updated in public constructor
 2014-07-23 18:33:37 +00:00
Jeff Davidson
ba3f4c3bed am c8c398e1: am fb28414b: am d0868c89: Implement VpnService.setBlocking(). 
* commit 'c8c398e192a565811e7e1e4a0e3d54aa0fe7c852':
  Implement VpnService.setBlocking().
 2014-07-23 18:31:36 +00:00
Alan Viverette
ea85c722bb am cc379868: Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev 
* commit 'cc379868058f453946f03c7c0fdb89bd2076c8d4':
  Ensure ripple mask gets updated in public constructor
 2014-07-23 18:30:36 +00:00
Jeff Davidson
44e2be10f6 am fb28414b: am d0868c89: Implement VpnService.setBlocking(). 
* commit 'fb28414b5a1d32e023c74c755fa0283290414606':
  Implement VpnService.setBlocking().
 2014-07-23 18:28:08 +00:00
Jeff Davidson
397c33799a am d0868c89: Implement VpnService.setBlocking(). 
* commit 'd0868c89eac6df2adbbdcdee7fe24dba943736a7':
  Implement VpnService.setBlocking().
 2014-07-23 18:23:50 +00:00
Brian Attwell
4f3afa6039 am 16846152: am 1a038e57: am 41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact 
* commit '16846152b19b9487cf3403b3d3b7e4d4af6e6f46':
  Add PICK_JOIN_CONTACT_ACTION action contact
 2014-07-23 18:23:47 +00:00
Chris Craik
f8a740e878 am 6663dfbb: am 97d572ec: am f2ecf428: Merge "Build layer damage bounds for shadows" into lmp-dev 
* commit '6663dfbb4725f0c902eb591714b43191982fcbcf':
  Build layer damage bounds for shadows
 2014-07-23 18:23:43 +00:00
Brian Attwell
85511418d4 am 1a038e57: am 41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact 
* commit '1a038e572ec718b2364650144dc6d6969a4a2410':
  Add PICK_JOIN_CONTACT_ACTION action contact
 2014-07-23 18:20:03 +00:00
Chris Craik
99bc64e721 am 97d572ec: am f2ecf428: Merge "Build layer damage bounds for shadows" into lmp-dev 
* commit '97d572ecb4804fc764a2bc99d0a0f6dddfe6fbd8':
  Build layer damage bounds for shadows
 2014-07-23 18:19:58 +00:00
Jeff Davidson
6bbf39cf6b Implement VpnService.setBlocking(). 
Bug: 12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
 2014-07-23 11:18:57 -07:00
Brian Attwell
b8bf2598f8 am 41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact 
* commit '41b62ac75082d823c05571e7d04c8cc5453218c9':
  Add PICK_JOIN_CONTACT_ACTION action contact
 2014-07-23 18:15:55 +00:00
Chris Craik
08ac4977de am f2ecf428: Merge "Build layer damage bounds for shadows" into lmp-dev 
* commit 'f2ecf428a0311d0b07ae35d743f5165384812547':
  Build layer damage bounds for shadows
 2014-07-23 18:15:51 +00:00
Brian Attwell
e98a95c156 Add PICK_JOIN_CONTACT_ACTION action contact 
This ContactsContract change is needed by ag/509090

Bug: 16190113
Change-Id: I0f96286bdf45015148d2e84f7fe7aac5b23e1ba2
 2014-07-23 18:11:13 +00:00
Sunny Goyal
fabf1f23d6 Fixing memory leak in WallpaperCropActivity 
issue: 15516788
Change-Id: I53a312addbb7ce17ecf02b2f14b9e991eab42be9
 2014-07-23 10:52:32 -07:00
Ye Wen
e5ebd4bc76 Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 2014-07-23 17:52:05 +00:00
Ye Wen
b87875eb88 Infer legacy network type for ConnectivityManager.requestNetwork 
ConnectivityManager.requestNetwork pass TYPE_NONE to
sendRequestForNetwork which prevents it from being used with legacy API
requestRouteToHostAddress. This CL infers the legacy network type
automatically from the network capabilities.

b/16324360

Change-Id: I591d38f875f42f56e8cfc157db2069c9eee0ee26
 2014-07-23 11:41:17 -07:00
Jason Monk
2961ce599e Make the 'locked' lock task not lock keyguard on exit 
While here also fix mIsLockTaskLocked to actually be set to a value
so that it can be used.

Bug: 16347391
Change-Id: I27416f4787b28d19d84f895889eea1d3202c1759
 2014-07-23 17:33:13 +00:00
Svet Ganov
a0f1089bb0 am 512357fd: am 5cc27606: am f4348489: Merge "Adding shell commands for grant/revoke of bind app widget permisison." into lmp-dev 
* commit '512357fda7da8d5b1fd93cc413cd585a14b61976':
  Adding shell commands for grant/revoke of bind app widget permisison.
 2014-07-23 17:26:52 +00:00
RoboErik
627ec760b0 am 1edef222: am 67430c74: am 80380f82: Switch Session APIs over to AudioAttributes 
* commit '1edef22273242f5f08a45a064e8d197a6bd08892':
  Switch Session APIs over to AudioAttributes
 2014-07-23 17:26:47 +00:00
Svet Ganov
5374ff295e am 5cc27606: am f4348489: Merge "Adding shell commands for grant/revoke of bind app widget permisison." into lmp-dev 
* commit '5cc27606f41f95810c8e7ce4e7855f4c4fae409c':
  Adding shell commands for grant/revoke of bind app widget permisison.
 2014-07-23 17:20:08 +00:00
RoboErik
397beaf432 am 67430c74: am 80380f82: Switch Session APIs over to AudioAttributes 
* commit '67430c74d436e58d92b0d53ffdca1de5ded20c58':
  Switch Session APIs over to AudioAttributes
 2014-07-23 17:20:01 +00:00
Dianne Hackborn
cb2303e365 am 6d4507fc: am 9566ecd9: am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev 
* commit '6d4507fcbeb8a550156efa7cd94cd69f041b5835':
  Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
 2014-07-23 17:18:32 +00:00
Sander Alewijnse
549d39e549 am f3c523e0: am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev 
* commit 'f3c523e06217b19ae8389f9ca8be71ed2cd9fe7b':
  Add Device Policy API to disable screen capture.
 2014-07-23 17:18:27 +00:00
Svet Ganov
dc25a3df33 am f4348489: Merge "Adding shell commands for grant/revoke of bind app widget permisison." into lmp-dev 
* commit 'f4348489228c244578719b20bc3d12317761378f':
  Adding shell commands for grant/revoke of bind app widget permisison.
 2014-07-23 17:15:35 +00:00
RoboErik
f82d14a209 am 80380f82: Switch Session APIs over to AudioAttributes 
* commit '80380f827a2147d436494b66193b7d59763de25b':
  Switch Session APIs over to AudioAttributes
 2014-07-23 17:15:32 +00:00
Dianne Hackborn
bfa2253e4b am 9566ecd9: am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev 
* commit '9566ecd9fbac848ba576282fd9ee315c33b28f0e':
  Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
 2014-07-23 17:12:01 +00:00