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

202331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
4d004cf2ef am ab06b4b4: am 2f94d220: am a309f4a0: am a8b518d7: am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit 'ab06b4b46dad7bc59b6529440f48ed03ed8459a0':
  updates: build-cmdline-update
 2015-06-19 21:48:32 +00:00
Yorke Lee
abe4a67612 am aad6327d: am 495cac60: am c723b8d7: Merge "Don\'t save cached contact info in call log when adding call" into mnc-dev 
* commit 'aad6327d3b619e8b34305fefba81010e21bc5eef':
  Don't save cached contact info in call log when adding call
 2015-06-19 21:40:32 +00:00
Alan Viverette
029513ec22 am e76415bc: am d1b5953d: am ac21d5c3: Merge "Invalidate the cached ripple drawable mask if mask layer changes" into mnc-dev 
* commit 'e76415bcf82c59dba501ee2645d66e98d68a826b':
  Invalidate the cached ripple drawable mask if mask layer changes
 2015-06-19 21:40:26 +00:00
Junda Liu
47e6a53d6e am 4fdd6a61: am cce3cdff: am 5385f5a0: Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev 
* commit '4fdd6a617e78c31e8610e5dd975b5cb297e0ae6a':
  Add comments to carrierconfigmanager for required permission.
 2015-06-19 21:40:20 +00:00
Jonathan Basseri
b7d4814c45 am 6a55fc86: am 44caca3c: am 48fb9d15: Merge "Migrate \'csp_enabled\' to CarrierConfigManager." into mnc-dev 
* commit '6a55fc8662b6f80c963e2b3a13aa4de46b49bf18':
  Migrate 'csp_enabled' to CarrierConfigManager.
 2015-06-19 21:40:14 +00:00
Chien-Yu Chen
a8f75863f7 am ae599fa0: am befbd422: am be2e38e0: Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev 
* commit 'ae599fa05986863d188055b8d0c568d6097091b3':
  ImageReader: Fix format workarounds for legacy devices
 2015-06-19 21:40:09 +00:00
Joe Fernandez
ab06b4b46d am 2f94d220: am a309f4a0: am a8b518d7: am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit '2f94d220511a0b42d9cb7750aa973e7e67577d17':
  updates: build-cmdline-update
 2015-06-19 21:39:52 +00:00
Joe Fernandez
2f94d22051 am a309f4a0: am a8b518d7: am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit 'a309f4a04199e935c60b91d3ac9565cbbee600ee':
  updates: build-cmdline-update
 2015-06-19 21:25:37 +00:00
Yorke Lee
aad6327d3b am 495cac60: am c723b8d7: Merge "Don\'t save cached contact info in call log when adding call" into mnc-dev 
* commit '495cac604d3c935fe23e0d73be5a750528106e41':
  Don't save cached contact info in call log when adding call
 2015-06-19 21:23:27 +00:00
Alan Viverette
e76415bcf8 am d1b5953d: am ac21d5c3: Merge "Invalidate the cached ripple drawable mask if mask layer changes" into mnc-dev 
* commit 'd1b5953d41ba430957dca542e01f121a381f8625':
  Invalidate the cached ripple drawable mask if mask layer changes
 2015-06-19 21:23:22 +00:00
Junda Liu
4fdd6a617e am cce3cdff: am 5385f5a0: Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev 
* commit 'cce3cdff5b0e2696ab1252cddd674f9bcb95b876':
  Add comments to carrierconfigmanager for required permission.
 2015-06-19 21:23:13 +00:00
Jonathan Basseri
6a55fc8662 am 44caca3c: am 48fb9d15: Merge "Migrate \'csp_enabled\' to CarrierConfigManager." into mnc-dev 
* commit '44caca3c45db5d9b2d0da30ffe6c6073b2436bd2':
  Migrate 'csp_enabled' to CarrierConfigManager.
 2015-06-19 21:23:08 +00:00
Chien-Yu Chen
ae599fa059 am befbd422: am be2e38e0: Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev 
* commit 'befbd42211c8d47c02f08db107f9bc18be8576c6':
  ImageReader: Fix format workarounds for legacy devices
 2015-06-19 21:22:58 +00:00
Wale Ogunwale
bd5af4b863 am 4f924737: am 9e23ef21: am 5acb30de: Merge "Apply the scale to surfaceinsets when computing crop region" 
* commit '4f9247374dbc702cfc8aecbbfa34fe14e1797c54':
  Apply the scale to surfaceinsets when computing crop region
 2015-06-19 21:14:53 +00:00
Joe Fernandez
a309f4a041 am a8b518d7: am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit 'a8b518d7c2ca006ad52d5900ebb3ca831490d373':
  updates: build-cmdline-update
 2015-06-19 21:08:08 +00:00
Wale Ogunwale
4f9247374d am 9e23ef21: am 5acb30de: Merge "Apply the scale to surfaceinsets when computing crop region" 
* commit '9e23ef2186aa9e1ce4fc209128cd006a24df2dff':
  Apply the scale to surfaceinsets when computing crop region
 2015-06-19 21:00:40 +00:00
Joe Fernandez
a8b518d7c2 am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit '041e01bbdffa85b9b5ffba201d36bd566eaa2651':
  updates: build-cmdline-update
 2015-06-19 20:59:03 +00:00
Yorke Lee
495cac604d am c723b8d7: Merge "Don\'t save cached contact info in call log when adding call" into mnc-dev 
* commit 'c723b8d74265239c8d97c0b222ccddd76e73149d':
  Don't save cached contact info in call log when adding call
 2015-06-19 20:53:34 +00:00
Alan Viverette
d1b5953d41 am ac21d5c3: Merge "Invalidate the cached ripple drawable mask if mask layer changes" into mnc-dev 
* commit 'ac21d5c36e0102d9f4594b845405432f72f41838':
  Invalidate the cached ripple drawable mask if mask layer changes
 2015-06-19 20:53:30 +00:00
Yorke Lee
c723b8d742 Merge "Don't save cached contact info in call log when adding call" into mnc-dev 2015-06-19 20:47:08 +00:00
Joe Fernandez
041e01bbdf am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit '003f8567defcb88b2e07b3f85f0b43f74d29b322':
  updates: build-cmdline-update
 2015-06-19 20:45:35 +00:00
Wale Ogunwale
9e23ef2186 am 5acb30de: Merge "Apply the scale to surfaceinsets when computing crop region" 
* commit '5acb30de6f65ff9ab47138b022a724ec489bdd9d':
  Apply the scale to surfaceinsets when computing crop region
 2015-06-19 20:45:05 +00:00
Alan Viverette
3d63af9c4d am bbe35b32: am 0cadef68: am f3e8dca8: Merge "Create ListPopupWindow handler against main looper" into mnc-dev 
* commit 'bbe35b32c2e1843d7d5f0ddde0063a4ead38a497':
  Create ListPopupWindow handler against main looper
 2015-06-19 20:43:42 +00:00
Selim Gurun
981fba5266 am d68ae140: am f714d239: am 8d79e36c: Merge "Clarify handling client certificates" into mnc-dev 
* commit 'd68ae14015be3a797afbb303324e19897d6b0cdd':
  Clarify handling client certificates
 2015-06-19 20:43:36 +00:00
Adrian Roos
2e0c409806 am f65f06fe: am cefeeb7c: am 4f43dc04: Assist disclosure 
* commit 'f65f06fe914253b046bea085a34bed02e54e19a8':
  Assist disclosure
 2015-06-19 20:43:31 +00:00
Alan Viverette
ac21d5c36e Merge "Invalidate the cached ripple drawable mask if mask layer changes" into mnc-dev 2015-06-19 20:43:19 +00:00
Alan Viverette
690a16c350 Invalidate the cached ripple drawable mask if mask layer changes 
Bug: 21955350
Change-Id: I2e610a5a0af39668b7e9447cfd7d48d35e11d299
 2015-06-19 13:42:39 -07:00
Junda Liu
cce3cdff5b am 5385f5a0: Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev 
* commit '5385f5a0b8b22a06a3befd5b660676dc04336a5f':
  Add comments to carrierconfigmanager for required permission.
 2015-06-19 20:36:46 +00:00
Jonathan Basseri
44caca3c45 am 48fb9d15: Merge "Migrate \'csp_enabled\' to CarrierConfigManager." into mnc-dev 
* commit '48fb9d15ecaceedd5477b7b780f22b7663ca103f':
  Migrate 'csp_enabled' to CarrierConfigManager.
 2015-06-19 20:36:41 +00:00
Wale Ogunwale
5acb30de6f Merge "Apply the scale to surfaceinsets when computing crop region" 2015-06-19 20:34:47 +00:00
Joe Fernandez
003f8567de Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 2015-06-19 20:32:34 +00:00
Junda Liu
5385f5a0b8 Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev 2015-06-19 20:31:56 +00:00
Alan Viverette
bbe35b32c2 am 0cadef68: am f3e8dca8: Merge "Create ListPopupWindow handler against main looper" into mnc-dev 
* commit '0cadef68e480ce57592928a200d0b437c2440886':
  Create ListPopupWindow handler against main looper
 2015-06-19 20:29:57 +00:00
Selim Gurun
d68ae14015 am f714d239: am 8d79e36c: Merge "Clarify handling client certificates" into mnc-dev 
* commit 'f714d23908eea3d73de3799cdaa0d54b1fe56326':
  Clarify handling client certificates
 2015-06-19 20:29:45 +00:00
Adrian Roos
f65f06fe91 am cefeeb7c: am 4f43dc04: Assist disclosure 
* commit 'cefeeb7c13653f5ba43b61205b22c8f70c843e71':
  Assist disclosure
 2015-06-19 20:29:40 +00:00
Junda Liu
fbd740c3ca Add comments to carrierconfigmanager for required permission. 
Bug: b/20826627
Change-Id: Ia8a42f4792429e56108a423f27c3f843f6b0f958
 2015-06-19 13:27:58 -07:00
Jonathan Basseri
48fb9d15ec Merge "Migrate 'csp_enabled' to CarrierConfigManager." into mnc-dev 2015-06-19 20:27:36 +00:00
Nick Kralevich
0be6987794 am 8fdc944a: am 26c0b5e3: am 1c7f0860: Merge "overlaytests: fix testrunner.py md5sum invocation" 
* commit '8fdc944a6f12af36daa25c07e9a3ece5f752dd4c':
  overlaytests:  fix testrunner.py md5sum invocation
 2015-06-19 20:12:01 +00:00
Chien-Yu Chen
befbd42211 am be2e38e0: Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev 
* commit 'be2e38e01c5c23d1ac240313ecb8f71251c448c3':
  ImageReader: Fix format workarounds for legacy devices
 2015-06-19 20:04:29 +00:00
Nick Kralevich
8fdc944a6f am 26c0b5e3: am 1c7f0860: Merge "overlaytests: fix testrunner.py md5sum invocation" 
* commit '26c0b5e31294d4dce13379bc9bccaf555fe1e6c2':
  overlaytests:  fix testrunner.py md5sum invocation
 2015-06-19 19:58:46 +00:00
Chien-Yu Chen
be2e38e01c Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev 2015-06-19 19:51:42 +00:00
Nick Kralevich
26c0b5e312 am 1c7f0860: Merge "overlaytests: fix testrunner.py md5sum invocation" 
* commit '1c7f0860c7d1bf087eefebfb1aa411ffbdfb76e6':
  overlaytests:  fix testrunner.py md5sum invocation
 2015-06-19 19:46:28 +00:00
Nick Kralevich
1c7f0860c7 Merge "overlaytests: fix testrunner.py md5sum invocation" 2015-06-19 19:34:29 +00:00
Alan Viverette
0cadef68e4 am f3e8dca8: Merge "Create ListPopupWindow handler against main looper" into mnc-dev 
* commit 'f3e8dca84b51e6eab1cc1384a5baabb0bae433a1':
  Create ListPopupWindow handler against main looper
 2015-06-19 19:32:52 +00:00
Jonathan Basseri
019523a8a4 Migrate 'csp_enabled' to CarrierConfigManager. 
This variable controls whether SIM cards are allowed to disable manual
carrier selection, so it makes more sense for it to be managed as
carrier config.

Currently the variable is only used in device overlays
for specific networks, but we are dropping the device-overlay so that
this simply applies to those networks.

Change-Id: Ia6ba6a89c94c0916c19bdf792e48a4feac87eded
 2015-06-19 12:28:08 -07:00
Alan Viverette
f3e8dca84b Merge "Create ListPopupWindow handler against main looper" into mnc-dev 2015-06-19 19:21:11 +00:00
Yorke Lee
457df5ff7e Don't save cached contact info in call log when adding call 
Bug: 20520236
Change-Id: I8ca051d4b93624b51de73640544ee5c6afbc0b7a
 2015-06-19 12:01:05 -07:00
Selim Gurun
f714d23908 am 8d79e36c: Merge "Clarify handling client certificates" into mnc-dev 
* commit '8d79e36c886a092bbc3d97b9c573e39021739886':
  Clarify handling client certificates
 2015-06-19 19:00:07 +00:00
Jason Monk
a47b3d365f am e2ca38a2: am 94227750: am cdca13c6: Merge "Fix intent tile to unlock on launching activities" into mnc-dev 
* commit 'e2ca38a2b8d50cb2b22cd005afecb670c5030d2f':
  Fix intent tile to unlock on launching activities
 2015-06-19 18:56:33 +00:00
Abodunrinwa Toki
f2c89ee507 am 1767b1fe: am e497455f: am 6983752a: Merge "Better FloatingToolbar positioning." into mnc-dev 
* commit '1767b1fed44dd524f999b0b18bddbf889550a8ab':
  Better FloatingToolbar positioning.
 2015-06-19 18:56:28 +00:00