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

50032 Commits

Author SHA1 Message Date
Keisuke Kuroyanagi
a3422ee070 am da0b7033: am 30e7f79b: am 1384d1d9: Merge "Fix: TextView makes new layouts too frequently." into mnc-dev 
* commit 'da0b7033e6e51045a14bb81772dca6dc1dae710f':
  Fix: TextView makes new layouts too frequently.
 2015-06-23 20:55:07 +00:00
Keisuke Kuroyanagi
da0b7033e6 am 30e7f79b: am 1384d1d9: Merge "Fix: TextView makes new layouts too frequently." into mnc-dev 
* commit '30e7f79bd0a5ab7cdf6c543668dfbda89c2b054e':
  Fix: TextView makes new layouts too frequently.
 2015-06-23 20:46:24 +00:00
Yin-Chia Yeh
45016a6301 am 361ef3d2: am e966f01d: am d772b5e3: Merge "Camera: document expected thumbnail size in capture result" into mnc-dev 
* commit '361ef3d239189e25b2a2755ac61eb9ed10bbfb5d':
  Camera: document expected thumbnail size in capture result
 2015-06-23 18:23:23 +00:00
Wale Ogunwale
b71ac8eccf am 59ab4b33: am 90cee497: am dd7705bb: Merge "Update surfaces secure flag on screen capture setting change" into mnc-dev 
* commit '59ab4b336e392d769df4e27a2ac760510e0449fe':
  Update surfaces secure flag on screen capture setting change
 2015-06-23 18:23:18 +00:00
Dianne Hackborn
4874bd161f am 9a5ea4e9: am 67e2aab1: am b7412897: Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev 
* commit '9a5ea4e9ca9ba965dc940a2b65224cd5e4ff033b':
  Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+
 2015-06-23 18:23:12 +00:00
Dianne Hackborn
ee9a55fd4b am 80e364a7: am 11ef84c8: am 6af40c83: Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev 
* commit '80e364a71ac41672436f86b2ceb61698f4fb59d1':
  Fix issue #21799741: AbstractThreadedSyncAdapter crashes...
 2015-06-23 18:23:06 +00:00
Lorenzo Colitti
4c060a190f am ba7ee88c: am acf761eb: am e2d921da: Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev 
* commit 'ba7ee88cb78aee12e923a531f513d6d90965db7a':
  Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.
 2015-06-23 18:22:49 +00:00
Yin-Chia Yeh
361ef3d239 am e966f01d: am d772b5e3: Merge "Camera: document expected thumbnail size in capture result" into mnc-dev 
* commit 'e966f01d0d6b22fbf0e492cfa5df119394c9e50c':
  Camera: document expected thumbnail size in capture result
 2015-06-23 18:08:15 +00:00
Wale Ogunwale
59ab4b336e am 90cee497: am dd7705bb: Merge "Update surfaces secure flag on screen capture setting change" into mnc-dev 
* commit '90cee497c0803861b8a779ca5cd87f4f8c4fde72':
  Update surfaces secure flag on screen capture setting change
 2015-06-23 18:07:54 +00:00
Dianne Hackborn
9a5ea4e9ca am 67e2aab1: am b7412897: Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev 
* commit '67e2aab109366fbb146d499f26c1d76c5c45bc52':
  Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+
 2015-06-23 18:07:49 +00:00
Dianne Hackborn
80e364a71a am 11ef84c8: am 6af40c83: Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev 
* commit '11ef84c8db8c31afd91b90ac4091e64ad5e7c3ca':
  Fix issue #21799741: AbstractThreadedSyncAdapter crashes...
 2015-06-23 18:07:44 +00:00
Lorenzo Colitti
ba7ee88cb7 am acf761eb: am e2d921da: Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev 
* commit 'acf761ebde2a551d8da98c3770668547148e6ec0':
  Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.
 2015-06-23 18:07:10 +00:00
Keisuke Kuroyanagi
1384d1d900 Merge "Fix: TextView makes new layouts too frequently." into mnc-dev 2015-06-23 17:56:48 +00:00
Wale Ogunwale
41adfc4935 am ca1ce938: am 781ec7e9: am e6734b6b: Merge "Fix javadoc for Adapter.getViewTypeCount()" 
* commit 'ca1ce9382bff4adc1ae56e7d659da4190576ceb6':
  Fix javadoc for Adapter.getViewTypeCount()
 2015-06-23 17:39:28 +00:00
Wale Ogunwale
ca1ce9382b am 781ec7e9: am e6734b6b: Merge "Fix javadoc for Adapter.getViewTypeCount()" 
* commit '781ec7e9d408dacfab761c02d6e4b1345c5dfd87':
  Fix javadoc for Adapter.getViewTypeCount()
 2015-06-23 17:28:30 +00:00
Yin-Chia Yeh
d772b5e363 Merge "Camera: document expected thumbnail size in capture result" into mnc-dev 2015-06-23 17:12:42 +00:00
Yin-Chia Yeh
5988311cbb Camera: document expected thumbnail size in capture result 
Codegen document update only.

Bug: 21880406
Change-Id: I058f6af62ff341943f7fdf6eefe8303431211970
 2015-06-23 10:11:57 -07:00
Wale Ogunwale
dd7705bbf2 Merge "Update surfaces secure flag on screen capture setting change" into mnc-dev 2015-06-23 16:49:43 +00:00
Dianne Hackborn
b74128978a Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev 2015-06-23 16:46:37 +00:00
Dianne Hackborn
6af40c8338 Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev 2015-06-23 16:45:50 +00:00
Wale Ogunwale
f5ad42f432 Update surfaces secure flag on screen capture setting change 
Also, added 'wm screen-capture [userId] [true|false]'
command.

Bug: 20934462
Change-Id: I14711003d7691fc4495428c12c9ff3457cd3773c
 2015-06-23 09:08:29 -07:00
Lorenzo Colitti
e2d921da29 Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev 2015-06-23 14:41:57 +00:00
Michael Wright
ab28eef80b am 91c8f208: am 611136c1: am 805fc82e: Merge "Add method to set action button on MotionEvent" into mnc-dev 
* commit '91c8f2086f3ed2de85391d99e7ffaf98041f105e':
  Add method to set action button on MotionEvent
 2015-06-23 13:20:38 +00:00
Michael Wright
91c8f2086f am 611136c1: am 805fc82e: Merge "Add method to set action button on MotionEvent" into mnc-dev 
* commit '611136c15c54e4c9da8deea9edf55c22cd56ec0f':
  Add method to set action button on MotionEvent
 2015-06-23 13:05:51 +00:00
Michael Wright
805fc82ea9 Merge "Add method to set action button on MotionEvent" into mnc-dev 2015-06-23 12:48:56 +00:00
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