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

200583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schaub
37621e246e am 92573764: am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs 
* commit '92573764195b99971b5649ff1ad7d869191828df':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup
 2015-07-14 00:27:50 +00:00
Robert Schaub
d0ca9dea25 am 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs 
* commit '695fc97aa2e24306537772195c33db0fffa4a23e':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing
 2015-07-14 00:27:45 +00:00
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
Robert Schaub
70d39c2836 am 2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs 
* commit '2b856100f67da1505eac30e2d989b84a2d68f20a':
  docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
 2015-07-14 00:26:21 +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
af5b992c85 am 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev 
* commit '9c2182e1b3d7a2eedb072d4ddcacb903e67b25aa':
  Add a dumpsys for KeyguardUpdateMonitor
 2015-07-14 00:15:40 +00:00
Robert Schaub
9257376419 am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs 
* commit 'fd186d20c53e8b0565f1360a71618710631eceeb':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup
 2015-07-14 00:15:35 +00:00
Robert Schaub
695fc97aa2 am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs 
* commit '0b403ebd6aecdf6691c4df009c791096d734aeb0':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing
 2015-07-14 00:15:31 +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
Jason Monk
9c2182e1b3 Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev 2015-07-14 00:10:11 +00:00
Christopher Tate
f0d6cb38c4 Prioritize most-recently-enabled link-handling app 
In the case when multiple apps handle a given web-link action,
all of which have been marked as "launch the app instead of a
browser" and so are otherwise ambiguous, always prefer the app
that was most recently placed into the always-handle-links state.

Bug 22051035

Change-Id: I3f43c19b0d7b74e9843445e41971bb5433affb1c
 2015-07-13 17:01:14 -07:00
Robert Schaub
fd186d20c5 am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs 
* commit '28006a3b31d1cd3765568ceed211f8bc8de9c50c':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup
 2015-07-13 23:58:09 +00:00
Robert Schaub
0b403ebd6a am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs 
* commit '1962b730067d5b9ad9666ee3a7d1e3f90004c7d7':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing
 2015-07-13 23:58:03 +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
Robert Schaub
2b856100f6 Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs 2015-07-13 23:41:29 +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