Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,667 Commits 3 Branches 0 Tags
446a59bc26ffab59e05bb0967bb27758170dbcf5
Commit Graph

170667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Jensen
446a59bc26 am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 
* commit 'a4afe13af38c03ae6abb76d2cf36ae0672328fd8':
  Reap unvalidated networks that have no chance of becoming highest scoring.
 2014-12-08 19:36:08 +00:00
Jeff Tinker
f062d8d7df am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev 
* commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1':
  Unhide secure stop APIs
 2014-12-08 19:35:59 +00:00
Jinsong Mu
5a181a2436 am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev 
* commit '6fac0351cebf84cf9505246e1fec5d74a1fa49c0':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
 2014-12-08 19:35:31 +00:00
Ihab Awad
657f25e964 am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 
* commit '2b45554454b6b9db3e2626fe3ca3cd5f42f960ca':
  Add Text-to-Speech annotations for phone number displays (1/3)
 2014-12-08 19:35:17 +00:00
David Friedman
ad9e0d5ed5 am 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit '7823e6ee900547e32436d3c76f1709c926d08284':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-08 19:34:38 +00:00
RoboErik
b22eea724b am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 
* commit '2d7a1b09e93aec3baeb16f46fb203ae14555d4a7':
  Route mute key events through MediaSessionService
 2014-12-08 19:34:32 +00:00
Quddus Chong
0d9d5d0a83 am e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 
* commit 'e6000f475346624587caa09cec37c85c3ab61ee8':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-08 19:34:16 +00:00
Quddus Chong
a40c6b0479 am f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 
* commit 'f428952e093239bce7c11eccc547a5094066c73f':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-08 19:34:08 +00:00
Wale Ogunwale
30b74ccf69 am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev 
* commit '80d119121f62bf995ff856f6865a977eb8c03239':
  Don't destroy surfaces of activities launched behind early.
 2014-12-08 19:34:01 +00:00
Filip Gruszczynski
73f0e9a3fe am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 
* commit '91a5dd9b435982eaad9ac4d8443199d260ef7208':
  Fix calculation of overscan insets in WindowState.
 2014-12-08 19:33:55 +00:00
Dianne Hackborn
0cfdd810de am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-08 19:33:49 +00:00
ztenghui
4cb33e7657 am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev 
* commit '550348220e959ff3c98b88c191a849ea2ee6062a':
  Fine tune the light radius from 800dp to 600dp
 2014-12-08 19:18:13 +00:00
Sanket Padawe
17c2719d03 am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 
* commit '49aeee2e791ec85a1c2f202d29e7113dc9d9cae0':
  Doing provisioning check for wifi tethering from SystemUI
 2014-12-08 19:17:45 +00:00
Eino-Ville Talvala
b71d983a7f am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev 
* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
  Camera2: Add HDR scene mode for backwards compatibility.
 2014-12-08 19:17:38 +00:00
Eino-Ville Talvala
cfdc0762e2 am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev 
* commit '3e3ae5b71590ce4272afaa5db1a1ff1fb26f4f6b':
  Fix docs build
 2014-12-08 19:17:31 +00:00
Stuart Scott
6b0025ea7c am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev 
* commit 'eb29c7332c40aacfae3dfb77588b262a043c94ee':
  Add mapping between RAT and Network Mode
 2014-12-08 19:17:22 +00:00
Jing Zhao
8d50d0fb27 am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature 
* commit '23ad6efbf81f1ea4f1e7b24ee0ca623045063b2f':
  Add checking to find AppDirectedSmsProxy for App Directed SMS feature
 2014-12-08 19:17:16 +00:00
Chris Wren
d4ba216a0f am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 
* commit 'ea9abd14dc4d4028f74b079c0462dec4fa7d6d18':
  Avoid race condition in heads up snooze code path.
 2014-12-08 19:17:09 +00:00
Christopher Tate
a2a5d4d043 am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev 
* commit '41b0cbb3a6e6e51ae75a971c3c6b6e36950a2bf5':
  Correctly parse previous PMBA state during backup
 2014-12-08 19:17:00 +00:00
Christopher Tate
bd2d8202e3 am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev 
* commit 'a42d95f1bc89dbbb4d34c62dac20ba3d9541603a':
  Tune delivery and batching of alarms
 2014-12-08 19:16:54 +00:00
Pavel Zhamaitsiak
913c989546 am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
 2014-12-08 19:16:43 +00:00
Justin Harrison
e0b2fa5c57 am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev 
* commit '87797c056c98eb527c85ccb7b7da33c99093e1bc':
  Add UUID for Pbap client
 2014-12-08 19:16:37 +00:00
Ihab Awad
91fd77283b am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev 
* commit '9ae44f927d678ae4b38259be2ce0601aa215e3b1':
  Relax access on deprecated fields for compatibility.
 2014-12-08 19:16:31 +00:00
Dan Sandler
b3014b0f3a am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev 
* commit '9e3adb821bef924cac5fb21f1e6c539495f3e831':
  RTL support for Lollipop Land.
 2014-12-08 19:16:26 +00:00
Fyodor Kupolov
d483a85e69 am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev 
* commit 'fed2812dc9fd717a7e3b1ebf9c602eda2bdfca08':
  Added isRemovingAdmin method
 2014-12-08 19:16:12 +00:00
Amith Yamasani
333c4a968e am 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev 
* commit '50734b700974bda5d955e61a8ae61e308a4dc8ad':
  Correct check of is user running
 2014-12-08 19:16:02 +00:00
Cheuksan Wang
673f443f7e am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev 
* commit '695b5d25879e894d381e95017b9ce5166adbb09f':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE
 2014-12-08 19:15:57 +00:00
Amith Yamasani
81b27f4c9f am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev 
* commit 'b2905092d6779349834635c6343556017c0c998e':
  Potential fix for accidental deactivation of profile owner
 2014-12-08 19:15:50 +00:00
ztenghui
9bb5cef91f am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev 
* commit '971fe6d66419065b96b46a20b7110ba435fa3a9a':
  AVD: Deep copy the animator target setup when mutate.
 2014-12-08 19:15:36 +00:00
Clare Bayley
2bfb88ca6e am fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs 
* commit 'fb569013c2b34acb58adc956a12c0f2581028e33':
  Updating screenshots to LMP release and N6
 2014-12-08 19:15:26 +00:00
RoboErik
0713f94493 am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev 
* commit 'e9905bd489cd6fcb75203b97a3a7d60b95329a6a':
  Make setting the session token in MediaBrowserService synchronous
 2014-12-08 19:15:18 +00:00
Dan Sandler
c92c94a5b6 am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit '2f6d30dfe60826027af9b59d80c536e8f424545d':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-08 19:15:06 +00:00
Benjamin Franz
f4a76651b0 am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
  Change the routing path of bluetooth headset connections.
 2014-12-08 19:14:56 +00:00
Justin Harrison
79e346fe1b am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 
* commit '66351d623acfe67033c605cce4a5d52faab3fb96':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-08 19:14:38 +00:00
Raph Levien
72ebd648b7 am 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev 
* commit '1a7bac35da420bbdf2ed7c2220ad0058abf4d091':
  Add 8 more scripts to the font fallback chain.
 2014-12-08 19:14:32 +00:00
Dongwon Kang
6077acaf14 am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev 
* commit 'bfc9739b1c1d57f388a8be62e99f3592f08ad9b3':
  TIF: handle a race condition when a session is crashed
 2014-12-08 19:14:20 +00:00
Dongwon Kang
46e18c1d41 am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev 
* commit '91d6f185d3c9109ed21956df7d8fd9501ccf1f6c':
  TIF: increase the time threshold for tune operation which was too harsh
 2014-12-08 19:14:14 +00:00
Filip Gruszczynski
5ae61a811a am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev 
* commit 'f5d1cf0b194147fae0aca2c2352b4843627ffc1e':
  Private Window flag to disable touch events in WallpaperService.
 2014-12-08 19:13:39 +00:00
Ricardo Cervera-Navarro
e2c8b5ba1c am 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs 
* commit '2ca0f49d7e9820699a022135101953313d666d0f':
  Revert "docs: Long press to dismiss fix by Wayne"
 2014-12-08 19:13:33 +00:00
Raph Levien
1918d0276a am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev 
* commit '8aa97d26e48cb86398e3f7df8103379564f16082':
  Change Linkify leniency to VALID
 2014-12-08 19:13:14 +00:00
Nancy Chen
8940955a08 am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev 
* commit '859fba1def4ed680cfbd189621c1ae557c2cab9a':
  Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)
 2014-12-08 19:13:06 +00:00
Dianne Hackborn
34e7003a78 am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev 
* commit '3cb6496b6c8bb48d458c46e7a062228f0488307d':
  Fix issue #18593636: Turn on "kill important processes that...
 2014-12-08 19:12:47 +00:00
Alan Viverette
5f5e13d07f am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs 
* commit '108e539495edb2bfc0d1a3a2cb0879583561bed6':
  Avoid extra saveLayer calls in RippleDrawable, fix docs
 2014-12-08 19:12:32 +00:00
Svetoslav
f477aeb367 am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched. 
* commit 'ed068f7c3047b3775647a6023c6960a4fc535144':
  Ensure all events from a showing window are dispatched.
 2014-12-08 19:12:22 +00:00
Lajos Molnar
967da505b2 am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev 
* commit '2b6dc199432a574d8655734865b0d75d2140fd8c':
  media: allow full range of Vorbis sampling rates
 2014-12-08 19:12:07 +00:00
Jinsuk Kim
3f771d879c am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev 
* commit 'd1133ba8855199b34c22b369f34c987a14c68b85':
  CEC: Introduce the retry for commands on the new device discovery.
 2014-12-08 19:11:58 +00:00
Dianne Hackborn
7039f6b423 am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev 
* commit '7ca6cc75e32437594bfa53c6f2ca14156c44eb17':
  Add test for isolated services.
 2014-12-08 19:11:51 +00:00
Nick Chalko
b7459df472 am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev 
* commit '4d1e20a24765711c2767cbab0a7077ca538c838e':
  docs: Fix typo, use --> user
 2014-12-08 19:11:45 +00:00
Chet Haase
0a8cc945ce am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev 
* commit 'b29c6299704ffd3885be6347bf85058010e24868':
  Fix seeking behavior
 2014-12-08 19:11:33 +00:00
Joe Fernandez
29fb654ee9 am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs 
* commit 'f6b890e448e369c506c0ed57a336ce3f6429b940':
  docs: Fixes for App Indexing training class
 2014-12-08 19:10:07 +00:00