Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,845 Commits 3 Branches 0 Tags
4b8de703b520eda0c6418eadb5acbc836fd4581a
Commit Graph

49995 Commits

Author SHA1 Message Date
Zoltan Szatmary-Ban
4b8de703b5 am d4fafa83: am ddc6d37e: am 2c3c66a2: Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 
* commit 'd4fafa831c23ec2f1fcea8450a843a087ddcf0d6':
  Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN
 2015-06-23 10:11:54 +00:00
Seigo Nonaka
59777aa280 am d3b86919: am 8cc1bfe4: am 02ebcdb9: Merge "Revive Null check for backward compatibility." into mnc-dev 
* commit 'd3b86919c72fe376af723180a8ecb0a487a01c1f':
  Revive Null check for backward compatibility.
 2015-06-23 10:11:48 +00:00
Zoltan Szatmary-Ban
d4fafa831c am ddc6d37e: am 2c3c66a2: Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 
* commit 'ddc6d37ebe7b60f5755241f343aae7ac522aef40':
  Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN
 2015-06-23 10:00:24 +00:00
Seigo Nonaka
d3b86919c7 am 8cc1bfe4: am 02ebcdb9: Merge "Revive Null check for backward compatibility." into mnc-dev 
* commit '8cc1bfe40efbaee6bef15c01b6767a90c3dc7845':
  Revive Null check for backward compatibility.
 2015-06-23 10:00:19 +00:00
Zoltan Szatmary-Ban
2c3c66a2cf Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 2015-06-23 08:44:49 +00:00
Seigo Nonaka
02ebcdb911 Merge "Revive Null check for backward compatibility." into mnc-dev 2015-06-23 08:31:12 +00:00
Chris Banes
1e0a380513 am 638b2b0a: am fff023e5: am 3ae5e8b2: Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev 
* commit '638b2b0ae249d84e9b95ed023facb854b9590b44':
  Fix leak for MenuInflater + setActionBar
 2015-06-23 07:40:43 +00:00
Chris Banes
638b2b0ae2 am fff023e5: am 3ae5e8b2: Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev 
* commit 'fff023e5d46050e2d9658573c789deed6ad5415b':
  Fix leak for MenuInflater + setActionBar
 2015-06-23 07:29:04 +00:00
Chris Banes
3ae5e8b25b Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev 2015-06-23 07:05:43 +00:00
Bart Sears
edfda6a1c8 am 0623d635: am 2544da4c: am 1ef23ade: Merge "Revert "Remove not needed contacts related perissions."" into mnc-dev 
* commit '0623d6359178df8861159f188df7645959866cd8':
  Revert "Remove not needed contacts related perissions."
 2015-06-23 06:55:00 +00:00
Eino-Ville Talvala
c3854a0948 am b3e27987: am 963b7100: am b14a1ac0: Merge changes from topic \'remove-high-res\' into mnc-dev 
* commit 'b3e2798707d590f0b76a5ea14a0565bf8bee6d77':
  Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
  Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
 2015-06-23 06:41:54 +00:00
Bart Sears
0623d63591 am 2544da4c: am 1ef23ade: Merge "Revert "Remove not needed contacts related perissions."" into mnc-dev 
* commit '2544da4cfbffbe11fdedf8e25e83d1841374fe57':
  Revert "Remove not needed contacts related perissions."
 2015-06-23 06:41:45 +00:00
Eino-Ville Talvala
b3e2798707 am 963b7100: am b14a1ac0: Merge changes from topic \'remove-high-res\' into mnc-dev 
* commit '963b7100770aa2d7de8ed8d2cd1b14a4f64da8e3':
  Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
  Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
 2015-06-23 06:29:55 +00:00
Bart Sears
1ef23adef8 Merge "Revert "Remove not needed contacts related perissions."" into mnc-dev 2015-06-23 06:18:20 +00:00
Bart Sears
ed5ff51b2c Revert "Remove not needed contacts related perissions." 
Broke the build, reverting.

This reverts commit a2991da0d6.

Change-Id: I2bdfa70fbd8a6c03e48426f85eeb63896762d5da
 2015-06-23 06:16:25 +00:00
Eino-Ville Talvala
b14a1ac057 Merge changes from topic 'remove-high-res' into mnc-dev 
* changes:
  Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
  Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
 2015-06-23 06:07:04 +00:00
Svet Ganov
46e2842303 am 8bf62c7d: am 477bb484: am 2b5bec93: Merge "Remove not needed contacts related perissions." into mnc-dev 
* commit '8bf62c7d0ccda08ae5982d3bbf39b72ba327b2fc':
  Remove not needed contacts related perissions.
 2015-06-23 05:39:15 +00:00
Christopher Tate
af6052f546 am 309499e0: am a116123f: am 6d2268a5: Merge "Back up / restore default app and intent filter verification state" into mnc-dev 
* commit '309499e0cd138d30d340460d6c99ecb8292717d1':
  Back up / restore default app and intent filter verification state
 2015-06-23 05:38:23 +00:00
Svet Ganov
8bf62c7d0c am 477bb484: am 2b5bec93: Merge "Remove not needed contacts related perissions." into mnc-dev 
* commit '477bb4840d5f04e5f350da31f7f654ddbb6150fd':
  Remove not needed contacts related perissions.
 2015-06-23 04:18:25 +00:00
Svet Ganov
2b5bec9356 Merge "Remove not needed contacts related perissions." into mnc-dev 2015-06-23 04:00:06 +00:00
Christopher Tate
309499e0cd am a116123f: am 6d2268a5: Merge "Back up / restore default app and intent filter verification state" into mnc-dev 
* commit 'a116123fb1125737e0b4bceba418e822397921b0':
  Back up / restore default app and intent filter verification state
 2015-06-23 03:20:35 +00:00
Nicolas Prevot
9a0f9682a9 am 69042609: am 2e70cf73: am 3ab6f9e6: Merge "Allow cross-profile app linking from work to personal." into mnc-dev 
* commit '6904260904176c67f200654d48fd8046c63011f4':
  Allow cross-profile app linking from work to personal.
 2015-06-23 03:04:52 +00:00
Alan Viverette
0ffb1bdfc9 am 7acc4a60: am 84340ab0: am ed0e11a9: Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev 
* commit '7acc4a60ca0ddc10d26981e25f6c1e042ce139d6':
  Ensure child is attached before performing measure/layout in Spinner
 2015-06-23 03:04:36 +00:00
Alan Viverette
4f53b0ecc4 am 42f9a5a6: am 32bc28f4: am aeaa396c: Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev 
* commit '42f9a5a6b74211b10927d8e95a04cd6a80efdd6d':
  Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""
 2015-06-23 03:04:19 +00:00
Nicolas Prevot
6904260904 am 2e70cf73: am 3ab6f9e6: Merge "Allow cross-profile app linking from work to personal." into mnc-dev 
* commit '2e70cf73b424440b163ce0ee2de1cb0b875cd913':
  Allow cross-profile app linking from work to personal.
 2015-06-23 02:53:41 +00:00
Alan Viverette
7acc4a60ca am 84340ab0: am ed0e11a9: Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev 
* commit '84340ab08bd61a48072a63f410631256f823945d':
  Ensure child is attached before performing measure/layout in Spinner
 2015-06-23 02:53:25 +00:00
Alan Viverette
42f9a5a6b7 am 32bc28f4: am aeaa396c: Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev 
* commit '32bc28f4c33e0dc5c33c4bae6ff084b344f90324':
  Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""
 2015-06-23 02:53:11 +00:00
Christopher Tate
6d2268a576 Merge "Back up / restore default app and intent filter verification state" into mnc-dev 2015-06-23 01:02:12 +00:00
Christopher Tate
6038d15cbc Back up / restore default app and intent filter verification state 
For apps not present on device, the state inherited from the ancestral
device is applied when the app is ultimately installed.

Bug 20144515

Change-Id: Ie05b4f1751357fc62f14e259da174b8cf465e913
 2015-06-22 17:20:26 -07:00
Rahul Chaturvedi
8ee0c2cf24 Merge "Add binder transaction tracking." 2015-06-22 23:55:09 +00:00
Nicolas Prevot
3ab6f9e691 Merge "Allow cross-profile app linking from work to personal." into mnc-dev 2015-06-22 23:18:32 +00:00
Alan Viverette
ed0e11a93a Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev 2015-06-22 23:07:33 +00:00
Alan Viverette
aeaa396cae Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev 2015-06-22 22:38:09 +00:00
Alan Viverette
9554f9fc9e Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" 
Turns out this was actually fine.

This reverts commit 9355533bf6.

Change-Id: I30c66fd423b569958244685098511d4ba08fbf37
 2015-06-22 22:37:58 +00:00
Alan Viverette
25c6cd61d4 Ensure child is attached before performing measure/layout in Spinner 
Bug: 21614663
Change-Id: Id84a720fac7050d312eb2eb6f12621217c4f8d0f
 2015-06-22 15:25:55 -07:00
Matthew Williams
0272474379 am 9ac21d4c: am 1a9245d5: am 8b1db074: Merge "Cancel Syncs that aren\'t making progress." into mnc-dev 
* commit '9ac21d4cf8d0870d7f452665fa110e1aba356f89':
  Cancel Syncs that aren't making progress.
 2015-06-22 22:22:59 +00:00
Matthew Williams
9ac21d4cf8 am 1a9245d5: am 8b1db074: Merge "Cancel Syncs that aren\'t making progress." into mnc-dev 
* commit '1a9245d568640301483bf10618081ddf42b9c0cc':
  Cancel Syncs that aren't making progress.
 2015-06-22 22:09:14 +00:00
Jeff Sharkey
0e5e4eea5e am 4edfd64b: am 421daf85: am c629271d: Merge "Forget private partition keys." into mnc-dev 
* commit '4edfd64bc1c69be3107fe924772331c1a974e28c':
  Forget private partition keys.
 2015-06-22 21:57:08 +00:00
Alan Viverette
8adf480f06 am 7f6da50d: am 823f51f3: am 696d2149: Merge "Match default color packing for captioning settings" into mnc-dev 
* commit '7f6da50d438753c57b6a408e59868fad3a4a89e1':
  Match default color packing for captioning settings
 2015-06-22 21:56:51 +00:00
Matthew Williams
8b1db0746f Merge "Cancel Syncs that aren't making progress." into mnc-dev 2015-06-22 21:41:49 +00:00
Nicolas Prevot
9edbda18df Allow cross-profile app linking from work to personal. 
If the profile owner sets ALLOW_PARENT_APP_LINKING:

ACTION_VIEW, scheme http/https intents sent from the work profile
can be resolved by personal apps if they specify a host.

BUG:21701782
Change-Id: I372e2405345539eac9d6b4fb08def6bf84da14a6
 2015-06-22 14:39:44 -07:00
Matthew Williams
1967c8ddd5 Cancel Syncs that aren't making progress. 
BUG: 18266674
1) If a sync has up/downloaded less than 10bytes in 60 seconds it is
considered to be making no progress and is summarily cancelled.

2) Apply a 30min hard time-out to initialization syncs.

Note that there is little proof that cancelling a sync has an
impact. All it results in is a Thread.interrupt on the sync
thread, which the adapter must itself implement. To this effect
this CL also updates the javadoc to make this clearer, and adds
some (unimplemented) threats about killing the hosting process.

Change-Id: I83c447648152ccbf76bb1fbd7e9216e01a37952f
 2015-06-22 14:36:36 -07:00
Jeff Sharkey
4edfd64bc1 am 421daf85: am c629271d: Merge "Forget private partition keys." into mnc-dev 
* commit '421daf8590cdbce7e41b7492608a985fe13c2033':
  Forget private partition keys.
 2015-06-22 21:33:44 +00:00
Eino-Ville Talvala
e365120aae Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth 
Need to check the right configuration list if the format is a
depth format.

Also refactor code slightly to use SurfaceUtils when possible.

Bug: 21902551
Change-Id: Icca2e81d8144bede46ad9f117d5e010ed409887c
 2015-06-22 14:21:22 -07:00
Eino-Ville Talvala
0819c75680 Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements 
- Reword requirements for FULL level
- Remove HIGH_RESOLUTION level
- Add StreamConfigurationMap#getHighResolutionOutputSizes
- Clean up StreamConfigurationMap implementation
- Add 5-argument HashCodeHelper

Bug: 20945581
Change-Id: I75ad4b23e902192c96ed501e10c7d55fc0ad72a6
 2015-06-22 14:21:22 -07:00
Alan Viverette
7f6da50d43 am 823f51f3: am 696d2149: Merge "Match default color packing for captioning settings" into mnc-dev 
* commit '823f51f3a2dcba1a0d509eab66b7ba330fddecea':
  Match default color packing for captioning settings
 2015-06-22 21:13:38 +00:00
Jeff Sharkey
c629271d48 Merge "Forget private partition keys." into mnc-dev 2015-06-22 21:09:52 +00:00
Jeff Sharkey
5cc0df214b Forget private partition keys. 
When we forget a private partition, ask vold to also forget the key
for that partition GUID.  This means we need to track both the
filesystem UUID and the partition GUID for a private volume.

Bug: 21782268
Change-Id: Icda1cbb65539d61dacc663428daf3d1a2e4c313e
 2015-06-22 14:07:10 -07:00
Alan Viverette
696d214946 Merge "Match default color packing for captioning settings" into mnc-dev 2015-06-22 20:55:12 +00:00
Rahul Chaturvedi
52613f9084 Add binder transaction tracking. 
Add the ability to am to be able to track binder transact calls. This
will help us diagnose excessive IPC calls.

This CL adds the trace-ip command to am. The usage is,

To start binder transaction tracking,
am trace-ipc start
To stop tracking and dump the data to a file,
am trace-ipc stop --dump-file <FILE>

Bug: 21398706
Change-Id: Ic0c9b3be757dd0662a2750a0d8447e2a5ef1fa90
 2015-06-22 16:28:24 -04:00