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 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
Paul Crowley
d2c9d0d92c Revert "am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev" 
This reverts commit c5da3fe1de36c231b8b1ac2aa07c2bf880af7b91, reversing
changes made to d884b41331fa486d5e4b02df725e37a497b08cc9.
 2015-07-14 15:42:29 +01:00
Paul Crowley
c5da3fe1de am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev 
* commit '8ae629f6cbda2ad55a1b6f3f508a04dc348ed796':
  Delete the user key when deleting a user.
 2015-07-14 12:00:55 +00:00
Paul Crowley
d884b41331 am 4e1174d9: (-s ours) am 7b6493a7: am 62d43bd9: am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev 
* commit '4e1174d9a74ee7e16ef98154d9206f5f600a129e':
  Use mount service to create user dirs.
 2015-07-14 12:00:49 +00:00
Seigo Nonaka
39ed6e7661 Merge "Update fullscreen state on hiding window." 2015-07-14 06:17:47 +00:00
Seigo Nonaka
93c47eab2b Update fullscreen state on hiding window. 
Need to update fullscreen state on hiding window as well as showing
window, otherwise IMM#isFullscreenWindow reports obsolete state after
hiding window by back key or device rotation.

Bug: 22238567
Change-Id: Ic8de161cd5d2ee161f32b9942cdc2c331ea4d48e
 2015-07-14 15:08:52 +09: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
Chris Wren
01a73cd81e am 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev 
* commit '500db3c10dda42c32da3c54733de7b1ab22bc583':
  fix build by restoring deleted enum
 2015-07-14 00:38:47 +00:00
Julia Reynolds
711ff3323f am 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev 
* commit '91941a57bec83889a98cc9a623a8c8d388fd4b6c':
  Remove personal/device group from sideloading screen.
 2015-07-14 00:38:41 +00:00
Jason Monk
2cdbe7d1b7 am 5c84cc8e: am cdeeeb69: am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev 
* commit '5c84cc8e6a60b006ea323f2a913e2bd1d494f698':
  Fix demo mode issues
 2015-07-14 00:38:32 +00:00
Chris Wren
4810bf5de9 am ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev 
* commit 'ea794192cf796b82407bdb9b3766db747ff45cc3':
  add new enums to MetricsConstans
 2015-07-14 00:38:26 +00:00
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
Robin Lee
7a472a81bf am 7475cc16: am 2d64ad5c: am 7321f09f: am 6a5c9370: am 6795a2ae: Check legacy VPN is connected before alerting 
* commit '7475cc169c8d4c8da023a6b896e8d2ec8372af92':
  Check legacy VPN is connected before alerting
 2015-07-14 00:25:56 +00:00
Jorim Jaggi
46ca45d5af am 0374d4d6: am 9042b4ce: am 3539d328: am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev 
* commit '0374d4d6d4f27e4bc5d1b887db06b4705128b2c9':
  Fix empty keyguard for once and all
 2015-07-14 00:25:49 +00:00
Jinsuk Kim
4231f74523 am 3382a2f0: am d2f0d236: am 4946bda6: am d971ebad: am 256642aa: Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev 
* commit '3382a2f0a577fac0c5fd012692554637d47ad363':
  CEC: Do not switch language if the new one is same as the old one
 2015-07-14 00:25:42 +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