drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,752 Commits 1 Branch 0 Tags
Commit Graph

206752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
5a4690bf26 Clean up unncessary defines 
LOG_TAG and TRACE_TAG are already defined in the makefile

Change-Id: I9e53e3dacbe018441edd74cb7c8c90846defee74
 2015-07-14 13:25:38 -07:00
James Cook
3aed7affdf Merge "Allow more transient icons in app shelf" 2015-07-14 17:57:27 +00:00
James Cook
2e9c889def Merge "Fix app shelf being visible during setup wizard" 2015-07-14 17:47:46 +00:00
James Cook
fa28d939ae Allow more transient icons in app shelf 
* Build the icon views dynamically rather than having a fixed number
  in the layout XML file
* Increase the maximum number of icons
* Keep the sort order stable as icons are added
* Infer when icons should be added and removed by observing recent
  tasks.

Bug: 22031100
Change-Id: Ifa78695ab8b332a47ff116bb502d8d095881e3f0
 2015-07-14 10:43:29 -07:00
Roshan Pius
106b82b0c6 am 77dae001: am 5eb7fd29: am ff5c6fde: am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev 
* commit '77dae001d051d0564cd718bc71ebd4dc890e4aea':
  Catch & log security exception in telephonymanager
 2015-07-14 16:52:27 +00:00
Amit Mahajan
cdae591ea1 am 45f52220: am 274d3052: am 67091577: am 66eb1ad1: am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev 
* commit '45f5222054f46a7a5042c67a1f8301adcac09404':
  Do not check runtime READ_PHONE_STATE if caller has the privileged one.
 2015-07-14 16:52:19 +00:00
John Reck
84e7055983 am ae94ac95: am 5d84b44b: am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev 
* commit 'ae94ac95754f4e1c4d4f9fda83e7a7e15e90d90b':
  Improve resource loading by ~3x
 2015-07-14 16:52:13 +00:00
Wale Ogunwale
885e53a6bd am efb4a3f6: am 061846d1: am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 
* commit 'efb4a3f6d2f77e6fff62b2c6f83c5c8497dc133c':
  Finish already paused activity if it should be finished after pausing
 2015-07-14 16:52:05 +00:00
Vinit Deshpande
f91e6ff1d2 am 68706332: am 266576c1: am 7ad8e6c8: am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev 
* commit '68706332e0826591ca59c8a9b34e4b9b5e65c05c':
  Fix multiple SSIDs for same Passpoint issues
 2015-07-14 16:51:58 +00:00
Jim Miller
f07602bea9 am c1aaa6ae: am 5ab70110: am a9845680: am a95d9f0b: am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev 
* commit 'c1aaa6ae49d6c1820472a2061ec8f6df08ffea50':
  Change MANAGE_FINGERPRINT permission to system|signature
 2015-07-14 16:51:51 +00:00
Aravind Akella
40d8c2be35 am 6804eed8: am bbe42345: am f61d30cc: am 42cae4ab: am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev 
* commit '6804eed853fe7afb597a7ec84c30e0df4ca74848':
  Log full class name of the client activating sensors for better debugging.
 2015-07-14 16:51:44 +00:00
Etan Cohen
84083d86bb am 6c2bba69: am afe38c01: am a249976c: am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev 
* commit '6c2bba69d561ec28143d81cdb67314aa74563ce0':
  Fix filter on CONNECTIVITY_ACTION updates
 2015-07-14 16:51:38 +00:00
Amith Yamasani
5e181938c4 am f3069383: am 4521361a: am 14627a2c: am 7efb0521: am 1578357d: Merge "Check user state after clearing identity." into mnc-dev 
* commit 'f30693831665ad68731b996f8b2744c72e4dddd2':
  Check user state after clearing identity.
 2015-07-14 16:51:30 +00:00
Chris Wren
8665a4e932 am 92c5e775: am 01a73cd8: am 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev 
* commit '92c5e7752005776ada31a7d4992548e36f06f335':
  fix build by restoring deleted enum
 2015-07-14 16:51:23 +00:00
Julia Reynolds
a7380629e9 am e8ff4f71: am 711ff332: am 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev 
* commit 'e8ff4f718dff0cf00c6c852f2bc908b508850fa1':
  Remove personal/device group from sideloading screen.
 2015-07-14 16:51:16 +00:00
Jason Monk
b663e0349b am c3b7c3a9: am 2cdbe7d1: am 5c84cc8e: am cdeeeb69: am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev 
* commit 'c3b7c3a9964bdb7da7eae1da0f7e428054ea157c':
  Fix demo mode issues
 2015-07-14 16:51:09 +00:00
Chris Wren
d2d6e41173 am 23652ff5: am 4810bf5d: am ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev 
* commit '23652ff538f414ca32b0c792bc29c60a4c62e4ca':
  add new enums to MetricsConstans
 2015-07-14 16:51:01 +00:00
Jason Monk
f62583b0bf am a6028857: am 10f015f0: am fceeadc3: am a04f5f27: am 59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev 
* commit 'a60288574292b4eebae09ed8c8832b3d5d051ce1':
  Show volume restriction toast on all users
 2015-07-14 16:50:55 +00:00
Geoff Mendal
fe24955572 am 703be9f6: (-s ours) am bd16cb67: (-s ours) am b48de758: (-s ours) am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '703be9f6ffb962a9b11f0755cae41f7818989c81':
  Import translations. DO NOT MERGE
 2015-07-14 16:50:48 +00:00
Rubin Xu
949d16ebd5 am 5571a986: am afe3c2b3: am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev 
* commit '5571a986f0a2939248aefc584248d08732c761e4':
  Remove ExternalStorageFormatter
 2015-07-14 16:50:41 +00:00
Esteban Talavera
e1f7a9ff7b am ffded0dd: am d943ac7d: am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev 
* commit 'ffded0dd94581c8c20701295d66083ac4dfd1e80':
  Use correct user when filtering app link candidates
 2015-07-14 16:50:35 +00:00
Esteban Talavera
f27decd439 am d132e1cd: am 3b869cb4: am 220fd3c0: am 4b114575: am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev 
* commit 'd132e1cd99d389e3074930dd2bc8501cb7386623':
  Don't send app links to parent profile if status == never
 2015-07-14 16:50:27 +00:00
Billy Lau
4c8d312606 am e385d26f: am cb2a7a2c: am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit 'e385d26fef2f62988c082ee8066f5d6715aa16c9':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-14 16:50:20 +00:00
Zhijun He
71e1b0af54 am 48016b9a: am b5468cbf: am cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos. 
* commit '48016b9afeae0cd246a1385471635180c64bc41c':
  Camera metadata: fix typos.
 2015-07-14 16:50:13 +00:00
Geoff Mendal
f7742d5e8c am f33db5c6: (-s ours) am eecc70e4: (-s ours) am e8284f31: (-s ours) am a2360b83: (-s ours) am 1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f33db5c6341513327ee0f212e79b90a4158e3802':
  Import translations. DO NOT MERGE
 2015-07-14 16:50:06 +00:00
Geoff Mendal
27c11aab6a am d37c4a06: (-s ours) am 5713c9ba: (-s ours) am 9710294d: (-s ours) am 01b006e1: (-s ours) am d64ba82e: (-s ours) Import translations. DO NOT MERGE 
* commit 'd37c4a06e0624e4ccecf4bd79d1c6acd52f48f48':
  Import translations. DO NOT MERGE
 2015-07-14 16:49:58 +00:00
Raph Levien
b34396d3c5 am aac0c9e7: am 9d66b9cd: am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev 
* commit 'aac0c9e7583239ec55e0456c4c88b79f5615caca':
  Improve Html.toHtml() documentation
 2015-07-14 16:49:51 +00:00
Amith Yamasani
5cc9a7a801 am b646cd6d: am f62ca82b: am a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev 
* commit 'b646cd6df50e99464335f3c196e386c8743fd29e':
  Fix new user creation regression due to vold remount calls
 2015-07-14 16:49:43 +00:00
Amith Yamasani
c9cbbf43bf am 09303a48: am ff61f431: am 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev 
* commit '09303a48b7e22ce54f1ea5eb03abcc18afa1d365':
  Avoid IPC call with an empty array
 2015-07-14 16:49:35 +00:00
Sanket Padawe
d85f654074 am d281d10b: am cb9d3de0: am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit 'd281d10b16bec899e6b5ffaaf7180bc214f7b578':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-14 16:49:28 +00:00
Adrian Roos
6198144f9c am e552f0a9: am 60e293cf: am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev 
* commit 'e552f0a903c0e2de3437320e0fb22e4205ec6146':
  Fix flash of uninitialized surface
 2015-07-14 16:49:17 +00:00
Carlos Valdivia
4eafb7a0d2 am 50cf5e3a: am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev 
* commit '50cf5e3a2bd544f4661660756ffc4c67d5afbb21':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
 2015-07-14 16:49:09 +00:00
Mady Mellor
2f30e890cd am 604b1138: am 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev 
* commit '604b1138f166a75b80c79243432798416a843c93':
  Fix: line slop shouldn't always increase / decrease by one line
 2015-07-14 16:49:01 +00:00
Mady Mellor
60ca990850 am ee4d90ba: am 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 
* commit 'ee4d90ba0d5abbb7379e6f47d97c12619bbfeeee':
  Fix line slop issue at end of line for Thai & CJK
 2015-07-14 16:48:54 +00:00
Wale Ogunwale
5126ff5367 am 1b59c401: am bdd89eed: am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev 
* commit '1b59c401c381ecaca5109cf68c65ec56fa3fe8d6':
  Revert "Finish already paused activity if it should be finished after pausing"
 2015-07-14 16:48:46 +00:00
John Reck
d6edf918c5 am cbb968cc: am dc7368cb: am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev 
* commit 'cbb968ccd7318aa61849366a8f170a37f1b8be58':
  JNI optimization tweaks to Paint high-frequency methods
 2015-07-14 16:48:38 +00:00
Chris Craik
f689dfc549 am f451be08: am e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit 'f451be081f5460a10b6ccf2d5e129ee69241da0f':
  Reduce cost of span type checking
 2015-07-14 16:48:28 +00:00
James Cook
968403dd13 Fix app shelf being visible during setup wizard 
* Introduce a LinearLayout to hold the app shelf widgets
* Hide it when the home button is hidden. If you can't go home
(launch the launcher) you shouldn't be able to use the shelf
to launch apps either.

Bug: 22206506
Change-Id: I5118e40786a0d26d6292850fef31f2b57c1880cd
 2015-07-14 09:37:30 -07:00
Roshan Pius
77dae001d0 am 5eb7fd29: am ff5c6fde: am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev 
* commit '5eb7fd29da2254bdc45f2d09d5bc59292ee0cc99':
  Catch & log security exception in telephonymanager
 2015-07-14 16:30:04 +00:00
Amit Mahajan
45f5222054 am 274d3052: am 67091577: am 66eb1ad1: am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev 
* commit '274d30521f78be5c9e7706cda469f78bf9f98afc':
  Do not check runtime READ_PHONE_STATE if caller has the privileged one.
 2015-07-14 16:29:58 +00:00
John Reck
ae94ac9575 am 5d84b44b: am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev 
* commit '5d84b44b416b5efd2d138c36e691d43396c1c1d8':
  Improve resource loading by ~3x
 2015-07-14 16:29:52 +00:00
Wale Ogunwale
efb4a3f6d2 am 061846d1: am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 
* commit '061846d19fb29a09b9972a47c94110464e8177d1':
  Finish already paused activity if it should be finished after pausing
 2015-07-14 16:29:40 +00:00
Vinit Deshpande
68706332e0 am 266576c1: am 7ad8e6c8: am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev 
* commit '266576c1a63f7be4d0ca9351dbb8c80d539be5f0':
  Fix multiple SSIDs for same Passpoint issues
 2015-07-14 16:29:33 +00:00
Jim Miller
c1aaa6ae49 am 5ab70110: am a9845680: am a95d9f0b: am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev 
* commit '5ab7011041a1944f9595c9361858639507cf63a3':
  Change MANAGE_FINGERPRINT permission to system|signature
 2015-07-14 16:29:26 +00:00
Aravind Akella
6804eed853 am bbe42345: am f61d30cc: am 42cae4ab: am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev 
* commit 'bbe4234545e1a6e4fcb792aac5a159e095edfd76':
  Log full class name of the client activating sensors for better debugging.
 2015-07-14 16:29:19 +00:00
Etan Cohen
6c2bba69d5 am afe38c01: am a249976c: am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev 
* commit 'afe38c01a80dc4e3f2d54a46184bffd7d8a8c5a4':
  Fix filter on CONNECTIVITY_ACTION updates
 2015-07-14 16:29:12 +00:00
Amith Yamasani
f306938316 am 4521361a: am 14627a2c: am 7efb0521: am 1578357d: Merge "Check user state after clearing identity." into mnc-dev 
* commit '4521361a5d58652249ec832565abac1f5b16de00':
  Check user state after clearing identity.
 2015-07-14 16:29:02 +00:00
Chris Wren
92c5e77520 am 01a73cd8: am 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev 
* commit '01a73cd81ea35f18eba96916e1c80eb5b800e922':
  fix build by restoring deleted enum
 2015-07-14 16:28:54 +00:00
Julia Reynolds
e8ff4f718d am 711ff332: am 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev 
* commit '711ff3323fd6641bbf83bbdad5c4032db98d8572':
  Remove personal/device group from sideloading screen.
 2015-07-14 16:28:43 +00:00
Jason Monk
c3b7c3a996 am 2cdbe7d1: am 5c84cc8e: am cdeeeb69: am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev 
* commit '2cdbe7d1b73a40abafb7596396cc97c40dd3803c':
  Fix demo mode issues
 2015-07-14 16:28:34 +00:00