203537 Commits

Author SHA1 Message Date
Robert Schaub
4fd4882b07 am c0b73edb: am d0ca9dea: am 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit 'c0b73edb7bdb808633b7986e7a73e9823454bee1':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing
2015-07-14 17:16:20 +00:00
David Friedman
2d85da887e am c2a0d1ed: am cb533c53: 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 'c2a0d1edfb59a9c1dfc0f92aaa7160345ccce2d7':
  docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-14 17:16:14 +00:00
Eric Gilmore
324e87429e am 43838d3f: am 16df17cf: 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 '43838d3f0b4473b891123be42fcdecb995543720':
  Adding a link to what is currently our most popular "100 Days" video.
2015-07-14 17:16:08 +00:00
Jinsuk Kim
203f2c374f am 605b1e97: am 1d391c85: am 7acee935: am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev
* commit '605b1e9796def7bbc5af7e6393b5cc70395b1366':
  Perform One touch play upon pressing home key
2015-07-14 17:16:02 +00: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
Chris Wren
23652ff538 am 4810bf5d: am ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
* commit '4810bf5de92caa55494e484ef36043f2c8fc52b7':
  add new enums to MetricsConstans
2015-07-14 16:28:28 +00:00
Jason Monk
a602885742 am 10f015f0: am fceeadc3: am a04f5f27: am 59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev
* commit '10f015f04847d4e0623da3945fe12752729b7903':
  Show volume restriction toast on all users
2015-07-14 16:28:22 +00:00
Geoff Mendal
703be9f6ff 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 'bd16cb67a4058d6faa8123f30fe657c0607dd05d':
  Import translations. DO NOT MERGE
2015-07-14 16:28:17 +00:00
Rubin Xu
5571a986f0 am afe3c2b3: am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
* commit 'afe3c2b3e51b254826b44559d6f4aebe40855168':
  Remove ExternalStorageFormatter
2015-07-14 16:28:06 +00:00
Esteban Talavera
ffded0dd94 am d943ac7d: am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev
* commit 'd943ac7d0754ef7b18c0ec459448d31ec853305e':
  Use correct user when filtering app link candidates
2015-07-14 16:28:00 +00:00
Esteban Talavera
d132e1cd99 am 3b869cb4: am 220fd3c0: am 4b114575: am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev
* commit '3b869cb49d5c22fa92d37057587b6d0569696ff4':
  Don't send app links to parent profile if status == never
2015-07-14 16:27:54 +00:00
Billy Lau
e385d26fef am cb2a7a2c: am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit 'cb2a7a2cc48253e8fe941322f4b59b8e2125eae8':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-14 16:27:45 +00:00
Zhijun He
48016b9afe am b5468cbf: am cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos.
* commit 'b5468cbf3060d2b7d6909e1cbaac18beb61e7111':
  Camera metadata: fix typos.
2015-07-14 16:27:39 +00:00
Geoff Mendal
f33db5c634 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 'eecc70e4af23e7976c0d8223b4d2cc5e9fef8fae':
  Import translations. DO NOT MERGE
2015-07-14 16:27:33 +00:00
Geoff Mendal
d37c4a06e0 am 5713c9ba: (-s ours) am 9710294d: (-s ours) am 01b006e1: (-s ours) am d64ba82e: (-s ours) Import translations. DO NOT MERGE
* commit '5713c9ba97aed895e100f0474752fb3ece6f88cf':
  Import translations. DO NOT MERGE
2015-07-14 16:27:26 +00:00
Raph Levien
aac0c9e758 am 9d66b9cd: am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
* commit '9d66b9cdc022399c2ed9c9c0bb86b172df1b3b75':
  Improve Html.toHtml() documentation
2015-07-14 16:27:20 +00:00
Amith Yamasani
b646cd6df5 am f62ca82b: am a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev
* commit 'f62ca82b96f75c714a5cd82f9d35df2bad686455':
  Fix new user creation regression due to vold remount calls
2015-07-14 16:27:13 +00:00
Amith Yamasani
09303a48b7 am ff61f431: am 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev
* commit 'ff61f4312a3bba3a217f7da96a300a5ed72d4937':
  Avoid IPC call with an empty array
2015-07-14 16:26:59 +00:00
Sanket Padawe
d281d10b16 am cb9d3de0: am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
* commit 'cb9d3de03293210c76928934e04da5c4b73c833a':
  Changes security for Passpoint to EAP security from "Passpoint".
2015-07-14 16:26:50 +00:00
Adrian Roos
e552f0a903 am 60e293cf: am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev
* commit '60e293cfed07ef32c16262435dc3d9092a7fb572':
  Fix flash of uninitialized surface
2015-07-14 16:26:43 +00:00
Carlos Valdivia
50cf5e3a2b am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev
* commit '1aefc7769804ad1b593355f7bd71e4d6f962d132':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
2015-07-14 16:26:35 +00:00
Mady Mellor
604b1138f1 am 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev
* commit '8fe9a0173ea9dd7334c5a634dea76055097e04ab':
  Fix: line slop shouldn't always increase / decrease by one line
2015-07-14 16:26:18 +00:00
Mady Mellor
ee4d90ba0d am 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
* commit '8f85f645154d02a3808ed3f3a3353d836fd994a5':
  Fix line slop issue at end of line for Thai & CJK
2015-07-14 16:26:11 +00:00
Wale Ogunwale
1b59c401c3 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 'bdd89eed375efdb23be8598e28661f2b7d0964d4':
  Revert "Finish already paused activity if it should be finished after pausing"
2015-07-14 16:26:00 +00:00
John Reck
cbb968ccd7 am dc7368cb: am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev
* commit 'dc7368cb856025b4c9813bc6ff96d5b7c311b690':
  JNI optimization tweaks to Paint high-frequency methods
2015-07-14 16:25:52 +00:00
Chris Craik
f451be081f am e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev
* commit 'e8a5ae29a0898de1a3194c079821091859afac31':
  Reduce cost of span type checking
2015-07-14 16:25:40 +00:00
Robert Schaub
c0b73edb7b am d0ca9dea: am 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit 'd0ca9dea259b2dd2def75f4f32722eddf409bea4':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing
2015-07-14 00:51:26 +00:00
David Friedman
c2a0d1edfb am cb533c53: 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 'cb533c53b380886975ffb8068d2df581d9747022':
  docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-14 00:51:19 +00:00
Eric Gilmore
43838d3f0b am 16df17cf: 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 '16df17cf19072664301def14c3f9f48ab6a1945a':
  Adding a link to what is currently our most popular "100 Days" video.
2015-07-14 00:51:13 +00:00
Jinsuk Kim
605b1e9796 am 1d391c85: am 7acee935: am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev
* commit '1d391c85bbe8314c036c362e37587bf6963d2359':
  Perform One touch play upon pressing home key
2015-07-14 00:51:07 +00:00
Roshan Pius
5eb7fd29da am ff5c6fde: am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev
* commit 'ff5c6fdef417c8f834b30837a111c9f17bc4a0af':
  Catch & log security exception in telephonymanager
2015-07-14 00:39:40 +00:00
Amit Mahajan
274d30521f am 67091577: am 66eb1ad1: am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev
* commit '6709157781344ed4b38d607abf245acb4b2d8f38':
  Do not check runtime READ_PHONE_STATE if caller has the privileged one.
2015-07-14 00:39:34 +00:00
John Reck
5d84b44b41 am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
* commit '72e8e0807a8734cb65199ec0a92e9dc4db7a2588':
  Improve resource loading by ~3x
2015-07-14 00:39:29 +00:00
Wale Ogunwale
061846d19f am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit 'ec565efe706746157883822a93470cb3ef0fe6c0':
  Finish already paused activity if it should be finished after pausing
2015-07-14 00:39:22 +00:00
Vinit Deshpande
266576c1a6 am 7ad8e6c8: am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
* commit '7ad8e6c8499f5b5327f6b81fb34e15f5d855a641':
  Fix multiple SSIDs for same Passpoint issues
2015-07-14 00:39:16 +00:00
Jim Miller
5ab7011041 am a9845680: am a95d9f0b: am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev
* commit 'a9845680221b1b343f13db0482264f07f07b57f1':
  Change MANAGE_FINGERPRINT permission to system|signature
2015-07-14 00:39:10 +00:00
Aravind Akella
bbe4234545 am f61d30cc: am 42cae4ab: am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
* commit 'f61d30ccdc97e7c34405fde2d2e2c9988ce076c4':
  Log full class name of the client activating sensors for better debugging.
2015-07-14 00:39:05 +00:00
Etan Cohen
afe38c01a8 am a249976c: am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
* commit 'a249976c3ed32a7d1051e9a5ce28f58826ba9100':
  Fix filter on CONNECTIVITY_ACTION updates
2015-07-14 00:38:59 +00:00
Amith Yamasani
4521361a5d am 14627a2c: am 7efb0521: am 1578357d: Merge "Check user state after clearing identity." into mnc-dev
* commit '14627a2c4a74d4b9c72df145e5c194572ae07632':
  Check user state after clearing identity.
2015-07-14 00:38:53 +00:00