drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,288 Commits 1 Branch 0 Tags
10f015f048
Commit Graph

200288 Commits

Author SHA1 Message Date
Jason Monk
10f015f048 am fceeadc3: am a04f5f27: am 59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev 
* commit 'fceeadc3f9b9cd574b79797122a15351cc006a15':
  Show volume restriction toast on all users
 2015-07-14 00:38:19 +00:00
Geoff Mendal
bd16cb67a4 am b48de758: (-s ours) am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'b48de758b28cdc34ce1fb307d096d3f6f9cddb57':
  Import translations. DO NOT MERGE
 2015-07-14 00:38:13 +00:00
Rubin Xu
afe3c2b3e5 am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev 
* commit '474f987dd783493967e9ea899398f6965a7d3515':
  Remove ExternalStorageFormatter
 2015-07-14 00:38:12 +00:00
Esteban Talavera
d943ac7d07 am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev 
* commit '8dd280c2b95af184c8547065ba4146aceb2900ac':
  Use correct user when filtering app link candidates
 2015-07-14 00:21:55 +00:00
Esteban Talavera
3b869cb49d am 220fd3c0: am 4b114575: am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev 
* commit '220fd3c047307e70211ae13456d9187f0b97ce26':
  Don't send app links to parent profile if status == never
 2015-07-14 00:21:49 +00:00
Billy Lau
cb2a7a2cc4 am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit '0be2efb256c6bcac3f9d17319c9af90bbef1010c':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-14 00:21:42 +00:00
Zhijun He
b5468cbf30 am cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos. 
* commit 'cf00a86461bb39ca5cb6461cab280aeb4d42bab3':
  Camera metadata: fix typos.
 2015-07-14 00:21:36 +00:00
Geoff Mendal
eecc70e4af am e8284f31: (-s ours) am a2360b83: (-s ours) am 1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e8284f31e752bd45152efab281ab695915437563':
  Import translations. DO NOT MERGE
 2015-07-14 00:21:28 +00:00
Geoff Mendal
5713c9ba97 am 9710294d: (-s ours) am 01b006e1: (-s ours) am d64ba82e: (-s ours) Import translations. DO NOT MERGE 
* commit '9710294d14b6e6071d650a33929d230286be8ff0':
  Import translations. DO NOT MERGE
 2015-07-14 00:21:22 +00:00
Raph Levien
9d66b9cdc0 am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev 
* commit '073477a18ee37c87ad69260edae48f48578af921':
  Improve Html.toHtml() documentation
 2015-07-14 00:21:16 +00:00
Amith Yamasani
f62ca82b96 am a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev 
* commit 'a5aaf335fa57e34622c6638efe8849c46ae76087':
  Fix new user creation regression due to vold remount calls
 2015-07-14 00:21:08 +00:00
Amith Yamasani
ff61f4312a am 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev 
* commit '2ae3ff2deac3d700f9fe39f16ab2afef69ac13c8':
  Avoid IPC call with an empty array
 2015-07-14 00:21:02 +00:00
Sanket Padawe
cb9d3de032 am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit 'f1a9868e18d1feb56434313701faaf52473f0942':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-14 00:20:55 +00:00
Adrian Roos
60e293cfed am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev 
* commit '63d58c0a33655faa1c6dd847d589872ab4d4f375':
  Fix flash of uninitialized surface
 2015-07-14 00:20:49 +00:00
Carlos Valdivia
1aefc77698 am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev 
* commit '4e976dd141dd585f7aea580048a85829e8658753':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
 2015-07-14 00:20:42 +00:00
Mady Mellor
8fe9a0173e am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev 
* commit '441ad4df23e064cefbed6e3b63ee56161ce19032':
  Fix: line slop shouldn't always increase / decrease by one line
 2015-07-14 00:20:36 +00:00
Mady Mellor
8f85f64515 am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 
* commit '9d4cd8cf48a06dbf2c6dff6ef2caf5ed79f89bff':
  Fix line slop issue at end of line for Thai & CJK
 2015-07-14 00:20:29 +00:00
Wale Ogunwale
bdd89eed37 am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev 
* commit 'd91f9c7e996241060a7503461e44e4e6787611dd':
  Revert "Finish already paused activity if it should be finished after pausing"
 2015-07-14 00:20:21 +00:00
John Reck
dc7368cb85 am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev 
* commit '78c93dfce682cac02f1e61b7c943c19fe5160001':
  JNI optimization tweaks to Paint high-frequency methods
 2015-07-14 00:20:15 +00:00
Chris Craik
e8a5ae29a0 am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit '3b34b0061b1c57e5932fc17f8611574233e768ae':
  Reduce cost of span type checking
 2015-07-14 00:20:07 +00:00
Jason Monk
fceeadc3f9 am a04f5f27: am 59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev 
* commit 'a04f5f27780f54dc73602498dfb7745918f93662':
  Show volume restriction toast on all users
 2015-07-13 23:35:35 +00:00
Geoff Mendal
b48de758b2 am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'd64aa49305123e191a0beda2648010c534ac3ee1':
  Import translations. DO NOT MERGE
 2015-07-13 23:35:31 +00:00
Rubin Xu
474f987dd7 am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev 
* commit 'f5d6d432af57722e951d88a420b189c45a243d4b':
  Remove ExternalStorageFormatter
 2015-07-13 23:35:27 +00:00
Esteban Talavera
8dd280c2b9 am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev 
* commit 'f463ac6647bce5e88c6329b730b5965029b9f372':
  Use correct user when filtering app link candidates
 2015-07-13 23:35:23 +00:00
Esteban Talavera
220fd3c047 am 4b114575: am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev 
* commit '4b1145759b6792151546ddab9bae38adb8a43769':
  Don't send app links to parent profile if status == never
 2015-07-13 23:35:19 +00:00
Billy Lau
0be2efb256 am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit 'f028ba3db3d3b6478154952dbbd8ed7422ad14f6':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-13 23:35:14 +00:00
Zhijun He
cf00a86461 am a9fc8aa3: am 4fb81253: Camera metadata: fix typos. 
* commit 'a9fc8aa3c88e7b837be65abf6f3b0f3e2e9a4a1e':
  Camera metadata: fix typos.
 2015-07-13 23:35:09 +00:00
Geoff Mendal
e8284f31e7 am a2360b83: (-s ours) am 1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'a2360b830146afa7c649df603b25429f6feda669':
  Import translations. DO NOT MERGE
 2015-07-13 23:35:05 +00:00
Geoff Mendal
9710294d14 am 01b006e1: (-s ours) am d64ba82e: (-s ours) Import translations. DO NOT MERGE 
* commit '01b006e1eae5a28317bf31a1e204b43c5b622344':
  Import translations. DO NOT MERGE
 2015-07-13 23:34:59 +00:00
Raph Levien
073477a18e am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev 
* commit '93a2c97dc71b211de1e9e3a7a64aa301309f3308':
  Improve Html.toHtml() documentation
 2015-07-13 23:34:55 +00:00
Amith Yamasani
a5aaf335fa am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev 
* commit '0fd2d2b124d2aa614131c7b9cedde9d18e830724':
  Fix new user creation regression due to vold remount calls
 2015-07-13 23:33:48 +00:00
Amith Yamasani
2ae3ff2dea am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev 
* commit '8117c2f8e491d9b48769139c5bca685e88106ae5':
  Avoid IPC call with an empty array
 2015-07-13 23:33:44 +00:00
Sanket Padawe
f1a9868e18 am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit '0a66123f62f5d28bbef4f88a32c6de97caab3cfe':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-13 23:33:40 +00:00
Adrian Roos
63d58c0a33 am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev 
* commit 'dc445a115fb93d3b6c900cd823032f340cc3cd56':
  Fix flash of uninitialized surface
 2015-07-13 23:33:35 +00:00
Carlos Valdivia
4e976dd141 am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev 
* commit 'cc3c93d30cd16597eb1e551d36237692cdb1299d':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
 2015-07-13 23:33:31 +00:00
Mady Mellor
441ad4df23 am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev 
* commit '7fac4d6cc41cab81b2b2202725ae69782f9bcce9':
  Fix: line slop shouldn't always increase / decrease by one line
 2015-07-13 23:33:26 +00:00
Mady Mellor
9d4cd8cf48 am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 
* commit '24950db2768def06509e9bfd4ed6ecb47318f31d':
  Fix line slop issue at end of line for Thai & CJK
 2015-07-13 23:33:22 +00:00
Wale Ogunwale
d91f9c7e99 am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev 
* commit '6ede9b679e3313816c11d5d84f3bea679d6f337b':
  Revert "Finish already paused activity if it should be finished after pausing"
 2015-07-13 23:33:18 +00:00
John Reck
78c93dfce6 am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev 
* commit '459337c8d41d516d7a85084cf7e7a8f83e14f426':
  JNI optimization tweaks to Paint high-frequency methods
 2015-07-13 23:33:13 +00:00
Chris Craik
3b34b0061b am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit 'be10a86620947bfee882c50ae725ceb10cbae98f':
  Reduce cost of span type checking
 2015-07-13 23:33:08 +00:00
Jason Monk
a04f5f2778 am 59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev 
* commit '59b1dfef62a041920f36c8e3e376d38facdd9c8d':
  Show volume restriction toast on all users
 2015-07-13 23:01:32 +00:00
Geoff Mendal
d64aa49305 am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'c021aaaf6bd085d7332a33232e8118bab50ecc1f':
  Import translations. DO NOT MERGE
 2015-07-13 23:01:27 +00:00
Rubin Xu
f5d6d432af am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev 
* commit 'cf9aebf138a3ec07277b1e5564751d2396a155c0':
  Remove ExternalStorageFormatter
 2015-07-13 23:01:21 +00:00
Esteban Talavera
f463ac6647 am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev 
* commit '0ec43f89d2fc7064e7b42b40b318bef15fb040b5':
  Use correct user when filtering app link candidates
 2015-07-13 23:01:05 +00:00
Esteban Talavera
4b1145759b am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev 
* commit '2292160320f29144f8f8f38bd6936e9f1efb4ae5':
  Don't send app links to parent profile if status == never
 2015-07-13 23:01:01 +00:00
Billy Lau
f028ba3db3 am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit '96d00ab359d60197321f06b4feb3d01f3fa03a29':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-13 23:00:54 +00:00
Zhijun He
a9fc8aa3c8 am 4fb81253: Camera metadata: fix typos. 
* commit '4fb81253edc726936d4b71b7e9c0789cab45e9da':
  Camera metadata: fix typos.
 2015-07-13 23:00:50 +00:00
Geoff Mendal
a2360b8301 am 1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1962ad3e09552af679feaad34452e164facb625b':
  Import translations. DO NOT MERGE
 2015-07-13 23:00:44 +00:00
Geoff Mendal
01b006e1ea am d64ba82e: (-s ours) Import translations. DO NOT MERGE 
* commit 'd64ba82e8953810dd8420e7810be016831528bed':
  Import translations. DO NOT MERGE
 2015-07-13 23:00:31 +00:00
Raph Levien
93a2c97dc7 am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev 
* commit '1b3d03512e7bc759d3cd340280d7a5c59195a063':
  Improve Html.toHtml() documentation
 2015-07-13 23:00:20 +00:00