197614 Commits

Author SHA1 Message Date
David Friedman
cb533c53b3 am 63bd0587: am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit '63bd0587f908e7799764fa159a20c111d725c4f6':
  docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-14 00:27:34 +00:00
Eric Gilmore
16df17cf19 am a29b8fbb: am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
* commit 'a29b8fbb329099fcb78228ab21b8560c383ea0da':
  Adding a link to what is currently our most popular "100 Days" video.
2015-07-14 00:27:30 +00:00
Jinsuk Kim
1d391c85bb am 7acee935: am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev
* commit '7acee9353b634ce3a60bf8b1fac0e24ac7f770f9':
  Perform One touch play upon pressing home key
2015-07-14 00:27:26 +00:00
David Friedman
63bd0587f9 am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit '91a44578e4f1788cb97da79863faaa4ba7970f45':
  docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-14 00:15:27 +00:00
Eric Gilmore
a29b8fbb32 am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
* commit '908c50a1727f546aa060b9fff1f2c648739acfee':
  Adding a link to what is currently our most popular "100 Days" video.
2015-07-14 00:15:23 +00:00
Jinsuk Kim
7acee9353b am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev
* commit 'e249eb3a6f33ee945113a8f11e8382e70c4e066f':
  Perform One touch play upon pressing home key
2015-07-14 00:15:19 +00:00
David Friedman
91a44578e4 am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit '5c3bf5847c98b23a525288ed04f77b2a68ec6870':
  docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-13 23:57:52 +00:00
Eric Gilmore
908c50a172 am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
* commit 'f13e914d23a47809d978183a8e6b6ab3a5d51098':
  Adding a link to what is currently our most popular "100 Days" video.
2015-07-13 23:57:43 +00:00
Roshan Pius
ff5c6fdef4 am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev
* commit '2ce65bddb50ecd376cc4eafdc9853b6bf50ac970':
  Catch & log security exception in telephonymanager
2015-07-13 23:56:12 +00:00
Jinsuk Kim
e249eb3a6f Merge "Perform One touch play upon pressing home key" into mnc-dev 2015-07-13 23:45:03 +00:00
Amit Mahajan
6709157781 am 66eb1ad1: am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev
* commit '66eb1ad11ecf8e33d2511d3a3b113429cccb7a72':
  Do not check runtime READ_PHONE_STATE if caller has the privileged one.
2015-07-13 23:36:30 +00:00
John Reck
72e8e0807a am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
* commit '074b3ceb847ba2d9c9795b730c54a27ba412f158':
  Improve resource loading by ~3x
2015-07-13 23:36:26 +00:00
Wale Ogunwale
ec565efe70 am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit 'eb2153c700ea8455388be23b37e2efbfe2932d58':
  Finish already paused activity if it should be finished after pausing
2015-07-13 23:36:22 +00:00
Vinit Deshpande
7ad8e6c849 am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
* commit '3f96f8b2fff2a2a7dc0a44d5f1219da8d7f2a5c2':
  Fix multiple SSIDs for same Passpoint issues
2015-07-13 23:36:17 +00:00
Jim Miller
a984568022 am a95d9f0b: am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev
* commit 'a95d9f0b725f7f462b27c0740936861438a1416b':
  Change MANAGE_FINGERPRINT permission to system|signature
2015-07-13 23:36:12 +00:00
Aravind Akella
f61d30ccdc am 42cae4ab: am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
* commit '42cae4aba7412a87acbf267a0c60f5847bbf13cf':
  Log full class name of the client activating sensors for better debugging.
2015-07-13 23:36:07 +00:00
Etan Cohen
a249976c3e am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
* commit '686be93854cce44d2dd87148ff8063edc89b6d7b':
  Fix filter on CONNECTIVITY_ACTION updates
2015-07-13 23:36:02 +00:00
Amith Yamasani
14627a2c4a am 7efb0521: am 1578357d: Merge "Check user state after clearing identity." into mnc-dev
* commit '7efb0521ff4af2eeca5c99011ece066848069ffc':
  Check user state after clearing identity.
2015-07-13 23:35:57 +00:00
Chris Wren
500db3c10d am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
* commit 'd5b0f69a457db4622e7ee6f73695a32e6f8c96f4':
  fix build by restoring deleted enum
2015-07-13 23:35:53 +00:00
Julia Reynolds
91941a57be am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
* commit '19fd86589b87faf8e243c6c33be17390867e67bb':
  Remove personal/device group from sideloading screen.
2015-07-13 23:35:48 +00:00
Jason Monk
5c84cc8e6a am cdeeeb69: am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev
* commit 'cdeeeb69068e04b2e072cc977562edf7b58399ce':
  Fix demo mode issues
2015-07-13 23:35:43 +00:00
Chris Wren
ea794192cf am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
* commit '2d8e01730390a66fbd9b4858b8ab6569ba50d622':
  add new enums to MetricsConstans
2015-07-13 23:35:39 +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
Roshan Pius
2ce65bddb5 am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev
* commit 'cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093':
  Catch & log security exception in telephonymanager
2015-07-13 23:31:19 +00:00
Roshan Pius
cf01fd0f12 Merge "Catch & log security exception in telephonymanager" into mnc-dev 2015-07-13 23:17:04 +00:00
Amit Mahajan
66eb1ad11e am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev
* commit '53e5ba22c1694fad23b67d18c42c01d6deada5f6':
  Do not check runtime READ_PHONE_STATE if caller has the privileged one.
2015-07-13 23:03:34 +00:00
John Reck
074b3ceb84 am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
* commit 'f96d9c5421b7df1c60024a0928639e18c6d96b7b':
  Improve resource loading by ~3x
2015-07-13 23:03:25 +00:00
Wale Ogunwale
eb2153c700 am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '093d8de298c258943ca79c1cf429f5ef5725d1bb':
  Finish already paused activity if it should be finished after pausing
2015-07-13 23:02:52 +00:00
Vinit Deshpande
3f96f8b2ff am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
* commit '0bd08fc22ae457791d95a4d557051e6601516bd0':
  Fix multiple SSIDs for same Passpoint issues
2015-07-13 23:02:36 +00:00
Jim Miller
a95d9f0b72 am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev
* commit '16c1764cf552432d304eaefd912d5aebe3192449':
  Change MANAGE_FINGERPRINT permission to system|signature
2015-07-13 23:02:24 +00:00
Aravind Akella
42cae4aba7 am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
* commit '37511e35ae22ea88539f1137ea2f74c9cb17f60c':
  Log full class name of the client activating sensors for better debugging.
2015-07-13 23:02:13 +00:00