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

39114 Commits

Author SHA1 Message Date
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
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
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
Bo Liu
c15fbba494 Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 2014-07-28 18:28:56 +00:00
Selim Gurun
d92e726cbe Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into lmp-dev 2014-07-28 18:28:56 +00:00
Ben Murdoch
64fb02956b Revert "Load the WebView Java code from an APK." DO NOT MERGE 
This reverts commit 72618c3363c83f2668dab4495b100a61d6d8700a.

Bug: 16448724
 2014-07-28 21:07:24 +01:00
Sandeep Siddhartha
39c12fab49 Use blob (shared memory) for large data in sound model/recognition event/config 
Also add a missing null check in writeBlob

Bug: 16516353
Change-Id: Ie702f8daae541cab7c2cee6e13d49e7fc84c84e1
 2014-07-28 11:10:32 -07:00
Alexandra Gherghina
ea1ade4d0b am 028cc238: am 814d50e4: am 705b1376: Return a default icon from the package manager directly 
* commit '028cc238a7e8ac2764c3a381c335b2235401bc4b':
  Return a default icon from the package manager directly
 2014-07-28 17:42:50 +00:00
Alexandra Gherghina
a71e3903e5 Return a default icon from the package manager directly 
Bug: 16369104
Change-Id: I2db300a69a08030eacc245ee91556f0443ba5878
 2014-07-28 17:30:56 +00:00
George Mount
2cacfe3a98 Allow changing bounds to and from a zero-sized bounds. 
Bug 14590183

Change-Id: I596cb384198a6f7de14afed0d78711f127d3511e
 2014-07-28 14:54:23 +00:00
John Spurlock
2b0e09c59f Settings: Constants for notification settings. 
Bug:16208321
Change-Id: Iaf18dfc2edda9d80553f02ea0a74236230f89079
 2014-07-28 20:43:47 -04:00
Christopher Tate
c17739d112 Provide outside-facing API for data management intent+label 
Bug 16346320

Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
 2014-07-28 23:13:06 +00:00
Jason Monk
9a090e6ded Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 2014-07-25 23:00:08 +00:00
Jason Monk
8863b57e89 Fix incorrect Activity#startLockTask doc 
It referenced a swipe down gesture that doesn't exist.  This should
be more safe, and cover other devices as well.

Bug: 16626273
Change-Id: I907b25a00d903f9f36ca335d3a75c1f8f931d50e
 2014-07-29 13:49:32 -04:00
Alan Viverette
216d3e6d81 Add better errors for unresolved attributes, remove unused code 
Change-Id: Icf81a81b9ce97b5a5edff85569e6e3da93149436
 2014-07-29 10:35:42 -07:00
George Mount
7299bc1305 Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 2014-07-25 21:16:23 +00:00
George Mount
807e40c55c Allow a "ghost view" that paint a different view from the overlay. 
Bug 15744995

The ghost view doesn't route touch events, but hides another
view in its normal parent, and paints it as a child of another
ViewGroup or ViewGroupOverlay.

Change-Id: I352e14c366ccfb7303cee1dbff8563c673fd12ff
 2014-07-29 07:27:52 -07:00
Jim Miller
604e7558ef Add new DevicePolicyManager API to allow fine-grained TrustAgent management 
This adds a new feature that allows a device admin to specify a
whitelist of features that are allowed for the given admin.

Change-Id: I83f853318efbcf72308532d0a997374f73fa9c10
 2014-07-28 21:32:01 -07:00
John Reck
1c7a170fa3 Merge "Avoid calling non-final methods in ctor" into lmp-dev 2014-07-25 21:16:23 +00:00
John Reck
aae9f3bf17 Avoid calling non-final methods in ctor 
Bug: 16239227

 Avoid potential issues in views that override invalidate() but
 are not prepared to have overridden methods called prior to their
 ctor

Change-Id: Ic2574bdfea454451d6881c7e27a6474dc4dbc07c
 2014-07-28 09:30:36 -07:00
John Reck
4830cede0c Merge "Throw IAE on invalid scale" into lmp-dev 2014-07-25 21:16:23 +00:00
John Reck
30794944d1 Throw IAE on invalid scale 
Bug: 16565964

Change-Id: I0cc35c532b42433381e1ae7f350c95ecbb4d09c3
 2014-07-28 09:20:21 -07:00
Lorenzo Colitti
c473dc4e4f Add a getBoundURL method that returns a network-specific URL. 
Change-Id: I4b57e675bb87064ab75dcc36b00fdc7a2987b86e
 2014-07-28 16:16:58 +00:00