Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
146,859 Commits 3 Branches 0 Tags
e7d8ff1159e4d72be82dbef807e32edeaa5117dd
Commit Graph

39139 Commits

Author SHA1 Message Date
Igor Murashkin
e7d8ff1159 am c5b6a0c8: am 44e5ce82: am 6dc35134: Merge changes I104c8243,I82811142 into lmp-dev 
* commit 'c5b6a0c8ba9f1c89ec58670e374039fe7e88df2a':
  camera2: legacy: fix cached results bug and fix focus modes
  camera2: legacy: Add focus support
 2014-07-30 14:27:54 +00:00
Prerepa Viswanadham
36c5cf089f am 22047da1: am 57f30880: am d5359a8e: Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling 
* commit '22047da1b9130892d5c45274a713fb97f9a90908':
  Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling
 2014-07-29 21:21:35 +00:00
Prerepa Viswanadham
f6b3d8ca36 Fix crash in Stopping/Starting BLE advertising after 
BluetoothAdapter cycling

Bug 16528460
Change-Id: Iad852bc93d307c5ca5f7e42f24248aa02c105e8a
 2014-07-29 21:06:29 +00:00
Jon Miranda
cea134eadd am c9d29fe3: am 56d9d1cf: am 1f4a4791: Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev 
* commit 'c9d29fe3ef35d568aa83e3ca404aa55e797f5792':
  Exposed getLocationOnScreen, added formatToHexString method.
 2014-07-29 21:05:59 +00:00
Michael Wright
62d0a425a6 am 7431252e: am 0ff95fbb: am f277aa69: Add paragraph tags to MediaProjection docs 
* commit '7431252efd77d634304bc10464bb9d310b046425':
  Add paragraph tags to MediaProjection docs
 2014-07-29 21:01:40 +00:00
Michael Wright
9469cdde2c Add paragraph tags to MediaProjection docs 
Change-Id: Ia881f9bcf3b93bd699f9ddf80d51ec7d0e74d2ed
 2014-07-29 20:46:40 +00:00
Adrian Roos
d06d87aa5f am 1bc3511a: am ecd63d4e: am b64bbc56: Fix checkbuild 
* commit '1bc3511a636118b4b5573bd186d920f0ce540816':
  Fix checkbuild
 2014-07-29 20:43:22 +00:00
Adrian Roos
489d2dfc29 Fix checkbuild 
Change-Id: I9c3de31af792863b93a29ef81b50e2149b0a2184
 2014-07-29 20:30:50 +00:00
Alan Viverette
e583961a54 am 87db1d21: am b05e3134: am 9bbfa2a3: Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 
* commit '87db1d219ce8f96511a11d780f7235fc718394a4':
  Clean up TimePicker and DatePicker styling
 2014-07-29 20:23:26 +00:00
Dake Gu
ed161f68e1 am 8d208dde: am 2b6e7e1a: am ebf01ef4: Merge "Transition: Don\'t suppressLayout(false) for returning activity" into lmp-dev 
* commit '8d208dde1a0dc187a4c7d9191aeb3cfd7bc6a45a':
  Transition: Don't suppressLayout(false) for returning activity
 2014-07-29 20:03:20 +00:00
Alan Viverette
935f6c86c6 am e944c06b: am 71d29ec9: am e89c4031: Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 
* commit 'e944c06b351701b929146a7817055f91606d8b9f':
  Partial revert "Add better errors for unresolved attributes, remove unused code"
 2014-07-29 18:45:30 +00:00
Sandeep Siddhartha
ae08717d53 am b8ae2304: am f3a14c50: am d3fd7b40: Read the keyphrase ID from the recognition event 
* commit 'b8ae2304fad8f02d1fdffee7b1d7ce4f9613ce0f':
  Read the keyphrase ID from the recognition event
 2014-07-29 18:36:22 +00:00
Matthew Williams
70f0ebe26a am 511a2246: am 7a2d0ca3: am bd8038b8: Merge "remove possible JobScheduler race in cancel()" into lmp-dev 
* commit '511a22460ef790270e870777d21b8ad7d36c55e2':
  remove possible JobScheduler race in cancel()
 2014-07-29 18:30:45 +00:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event 
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
 2014-07-29 11:24:51 -07:00
Jason Monk
7bc5eb4324 am 92333f39: am f3bc00a3: am 9e9b5c70: Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 
* commit '92333f395d1a00865b95f7d8c066ebcae8fcfb98':
  Fix incorrect Activity#startLockTask doc
 2014-07-29 18:13:09 +00:00
Alan Viverette
93ceaae722 am d1f27d1e: am 31560851: am 936ee391: Merge "Add better errors for unresolved attributes, remove unused code" into lmp-dev 
* commit 'd1f27d1e736a277d09de8c855f1b872256ce5548':
  Add better errors for unresolved attributes, remove unused code
 2014-07-29 17:56:15 +00:00
George Mount
a0e20d8d94 am 8859a36b: am 21ad6298: am b8c728f3: Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 
* commit '8859a36bf5ab980cbea3c19fdec66102a38a05f6':
  Allow a "ghost view" that paint a different view from the overlay.
 2014-07-29 15:12:34 +00:00
George Mount
68100a58c0 am 562dd4f3: am 610c6e42: am 3356ef9d: Add default propagation back to Explode. 
* commit '562dd4f3041ff650486850cce2692d8c2ab82ee4':
  Add default propagation back to Explode.
 2014-07-29 14:26:50 +00:00
George Mount
964c3cf5b2 Add default propagation back to Explode. 
Bug 16217557

Change-Id: I47460db128749af978077755a777068392492aee
 2014-07-29 14:13:00 +00:00
Adrian Roos
92e387192e am 80395839: am e29906bc: am c7af998e: Merge "Make TrustAgentService a SystemApi" into lmp-dev 
* commit '80395839bdb724285d719879e21218a61b15295d':
  Make TrustAgentService a SystemApi
 2014-07-29 13:42:07 +00:00
Jorim Jaggi
2ee2a77493 am 0b8fe904: am 1a456466: am 2e0d19f1: Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2) 
* commit '0b8fe904470b7d033cdc9345df16d486f5afd676':
  Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2)
 2014-07-29 13:33:26 +00:00
Jim Miller
7eaf0d76d1 am ced267d1: am 112121f6: am 502aab60: Merge "Add new DevicePolicyManager API to allow fine-grained TrustAgent management" into lmp-dev 
* commit 'ced267d1599c97957032a84d9c6ac764eb922e1f':
  Add new DevicePolicyManager API to allow fine-grained TrustAgent management
 2014-07-29 13:25:01 +00:00
Jorim Jaggi
e411fdfa4c Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2) 
Change-Id: I5d234dc4383bbf205bde1a0e7f1e8266fc37d13a
 2014-07-29 14:43:03 +02:00
John Spurlock
10a3b3f705 am da70bbdf: am 0c38e849: am e78d5af1: Merge "Settings: Constants for notification settings." into lmp-dev 
* commit 'da70bbdf14513ba96a4474c0656f6d2ba1a5af10':
  Settings: Constants for notification settings.
 2014-07-29 02:24:01 +00:00
Primiano Tucci
0d80623b39 Refactor ActivityManagerService and make WebViewFactory more pedantic. 
This CL adds more robustness to the logic in WebViewFactory, checking
whether the isolated process did start at all and catching exceptions
in its java side.
Also, this addresses the refactor comments received in CL 509840.

BUG:16403706
Change-Id: Iaaea6d36142ece6d974c2438259edf421fce9f2e
 2014-07-28 18:38:58 -07:00
Sreeram Ramachandran
2170847a8e am 8bd0ba70: am 632c22fe: am bce2867e: Allow VPNs to add/remove link addresses dynamically. 
* commit '8bd0ba703491b8d789f48f334f507f14d8594555':
  Allow VPNs to add/remove link addresses dynamically.
 2014-07-29 01:02:26 +00:00
Riley Andrews
81f2ee08b6 am c496defe: am 42c85a7a: am d85845c6: Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia\'s implementation." into lmp-dev 
* commit 'c496defe9c36aa412c84a7353d9e5d28f0bb1e57':
  Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation.
 2014-07-29 00:50:41 +00:00
Sreeram Ramachandran
f4e0c0cb8e Allow VPNs to add/remove link addresses dynamically. 
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
 2014-07-29 00:32:59 +00:00
Christopher Tate
2fc9dfff52 am 8f72c755: am fb9e3c46: am 3c4efc3e: Merge "Provide outside-facing API for data management intent+label" into lmp-dev 
* commit '8f72c75581c9e1924bf8fab173335ed344673109':
  Provide outside-facing API for data management intent+label
 2014-07-28 23:43:36 +00:00
Jinsuk Kim
b53feae6c9 am 71475173: am a5a9eeaa: am c6a4ac34: Merge "Add MHL getPortInfo" into lmp-dev 
* commit '714751734a867bde0b554f79d219ae436505432a':
  Add MHL getPortInfo
 2014-07-28 23:35:48 +00:00
Yin-Chia Yeh
78e0e0198f am b290566c: am 4bcca6fc: am 9c65a371: Merge "Camera2: Fix wrong usage of toArray" into lmp-dev 
* commit 'b290566cd628230eaef561e38162086da1651a65':
  Camera2: Fix wrong usage of toArray
 2014-07-28 23:35:26 +00:00
Christopher Tate
485536017c am 38ffe5fe: am e1ec86ef: am a2472304: Add data-management intent + label to BackupTransport API 
* commit '38ffe5fe05d6c6d9040f98afb1e7dc61a1750099':
  Add data-management intent + label to BackupTransport API
 2014-07-28 23:34:21 +00:00
Alan Viverette
4d193bdbe7 Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 2014-07-28 22:45:16 +00:00
Alan Viverette
60727e07c6 Clean up TimePicker and DatePicker styling 
Removes the time and date picker specific themes and defaults their
theme attributes to use the alert dialog theme attribute's value.

BUG: 14973897
Change-Id: Id5cc74ea0c1a379fc1ee76b354a1bb5ba329585a
 2014-07-29 12:49:50 -07:00
Matthew Williams
ee410da42b remove possible JobScheduler race in cancel() 
Client can jobFinished() before getting a cancel msg.
1) Do better clean up of JobServiceContext after client jobFinished()
to remove superfluous MSG_CANCELs
2) When processing MSG_CANCEL check whether the context is still active
3) Do JobServiceContext cleanup before calling back to JobSchedulerService
Client can get a cancel msg even after calling jobFinished() (opposite to above)
1) explicitly check whether there are any MSG_CALLBACKs in the queue before
processing a MSG_CANCEL. If there are we can throw away the cancel.

Bug: 16547638
Change-Id: I90644586c7895a9ce97de752a5d657faf7f74b78
 2014-07-29 11:11:41 -07:00
Craig Mautner
9e935afab8 am bbd65170: am 99f8774a: am cdc00db0: Make affiliatedTaskId public and unhidden. 
* commit 'bbd6517087a3dad48efd1c4f418971be3c198959':
  Make affiliatedTaskId public and unhidden.
 2014-07-28 21:57:57 +00:00
George Mount
c5f487917e am aee36bb5: am d35a7390: am 2c479d80: Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev 
* commit 'aee36bb5e387937917d09f38e25777eda45f1561':
  Allow changing bounds to and from a zero-sized bounds.
 2014-07-28 21:57:52 +00:00
Christopher Tate
9679410db5 Add data-management intent + label to BackupTransport API 
Bug 16346320

Change-Id: Id9e855a1d3cebbf801c27a21e1edc3ffcccfd2e9
 2014-07-28 21:33:15 +00:00
Craig Mautner
22132d7950 Make affiliatedTaskId public and unhidden. 
Allow apps to see which of their tasks are affiliated in the
RecentTaskInfo returned by getAppTasks().

Fixes bug 16546323.

Change-Id: I54d75c02c194f58fb6513fa91c312289460f56b4
 2014-07-28 21:10:16 +00:00
Eino-Ville Talvala
3394151fc2 am bd72c6fd: am a0a1c5cc: am c9e436f5: Camera2: CameraManager refurbishing and error management 
* commit 'bd72c6fd39c5b3896a94bcb07d59f172f456dcd4':
  Camera2: CameraManager refurbishing and error management
 2014-07-28 20:32:22 +00:00
Bo Liu
01fb41dfb7 am 752e9172: am e211d641: am 7a286b09: Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 
* commit '752e91720dd4275341e28eb6293da2322b45612d':
  Add WebView.enableSlowWholeDocumentDraw
 2014-07-28 20:24:11 +00:00
Eino-Ville Talvala
bd9b106806 Camera2: CameraManager refurbishing and error management 
- Invoke availability listeners when first added
- Handle camera service crashes
 - Listen to service death
 - Attempt to rebind on every call if service died
 - If service is still dead, act as if no cameras are connected
- Fix bug in DeviceImpl that prevented proper handling of errors on open
- For clarity, don't UncheckedThrow for exceptions that are already unchecked

Bug: 16514157
Bug: 16483815
Bug: 16483222
Bug: 16561237

Change-Id: I3d54de1204f5a863882cf675fcee6280d53c4039
 2014-07-28 20:21:12 +00:00
Robert Greenwalt
06330237c4 am 570ef911: am 41c1e477: am 13c4ee0e: Merge "Remove dead code 1." into lmp-dev 
* commit '570ef91101d084264313f34663a00907e94f46c8':
  Remove dead code 1.
 2014-07-28 19:26:22 +00:00
Sreeram Ramachandran
acd32ca792 am e5d51366: am 05293dc8: am a62c7010: Prohibit address families by default unless a VPN explicitly allows them. 
* commit 'e5d513660eafe2030035c03880e5aafd437c52f4':
  Prohibit address families by default unless a VPN explicitly allows them.
 2014-07-28 19:11:30 +00:00
Sreeram Ramachandran
42065ac64c Prohibit address families by default unless a VPN explicitly allows them. 
Bug: 15972465
Change-Id: I3278d94536fefacc86390c1ba4231680f7be8589
 2014-07-28 18:52:41 +00:00
Sandeep Siddhartha
095bc5e2f2 am 82c1ef72: am 9c172801: am d2feddff: Use blob (shared memory) for large data in sound model/recognition event/config 
* commit '82c1ef722cc6b7b3b8df76d91a40db424e811644':
  Use blob (shared memory) for large data in sound model/recognition event/config
 2014-07-28 18:31:17 +00:00
Dake Gu
09d9c3be8a Transition: Don't suppressLayout(false) for returning activity 
Change-Id: I7be8a779ab8996809b36baa107acd55ab872580c
 2014-07-29 11:34:35 -07:00
Alan Viverette
57b69dd27e Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 2014-07-28 18:28:56 +00:00
Alan Viverette
500c56089f Partial revert "Add better errors for unresolved attributes, remove unused code" 
This reverts commit 0e42f4b98752b6457b04887e2a557fa007da73d7.

Change-Id: Ic3f0cb709c7aaa0a9892d728311886714ba73f22
 2014-07-29 11:30:35 -07:00
George Mount
a7dc1702af Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev 2014-07-28 18:28:56 +00:00