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

176887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stuart Scott
85ca687df8 am 6b0025ea: am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev 
* commit '6b0025ea7ca0e7343ee95bc622261b2f3e86012a':
  Add mapping between RAT and Network Mode
 2014-12-09 00:19:09 +00:00
Jing Zhao
a0973778ca am 8d50d0fb: am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature 
* commit '8d50d0fb27c1958dbd047bb8a46d7183d873f131':
  Add checking to find AppDirectedSmsProxy for App Directed SMS feature
 2014-12-09 00:19:03 +00:00
Chris Wren
0d6aacb802 am d4ba216a: am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 
* commit 'd4ba216a0f0e7b175fa1aa6a054c6f257cb88c17':
  Avoid race condition in heads up snooze code path.
 2014-12-09 00:18:57 +00:00
Christopher Tate
6e69f370f9 am a2a5d4d0: am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev 
* commit 'a2a5d4d043378b1a7e3630f89f182a32affac27f':
  Correctly parse previous PMBA state during backup
 2014-12-09 00:18:52 +00:00
Christopher Tate
891663f9fc am bd2d8202: am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev 
* commit 'bd2d8202e353cda22e288452c4feb8344f20c5ef':
  Tune delivery and batching of alarms
 2014-12-09 00:18:47 +00:00
Pavel Zhamaitsiak
0cec63a283 am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 
* commit '913c9895466c6749aa1c41b875d69d5de3e3b66b':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
 2014-12-09 00:18:39 +00:00
Justin Harrison
04e8a5fb4c am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev 
* commit 'e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983':
  Add UUID for Pbap client
 2014-12-09 00:18:35 +00:00
Ihab Awad
cbf5984bbc am 91fd7728: am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev 
* commit '91fd77283b41e988e6dea0ba02a5994f00b8e1ad':
  Relax access on deprecated fields for compatibility.
 2014-12-09 00:18:30 +00:00
Dan Sandler
864fda2cc7 am b3014b0f: am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev 
* commit 'b3014b0f3ae26c5b8e42bee79600a293787866da':
  RTL support for Lollipop Land.
 2014-12-09 00:18:26 +00:00
Fyodor Kupolov
77779aa3a5 am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev 
* commit 'd483a85e69c3bb83b25473b93806e063b72c9315':
  Added isRemovingAdmin method
 2014-12-09 00:18:21 +00:00
Amith Yamasani
0d1f8bf705 am 333c4a96: am 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev 
* commit '333c4a968edc48d4a0ceb1e82f8f9b520696be8a':
  Correct check of is user running
 2014-12-09 00:18:16 +00:00
Cheuksan Wang
8b3f47b35a am 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev 
* commit '673f443f7e92956399c322b31a14178436fa723b':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE
 2014-12-09 00:18:12 +00:00
Amith Yamasani
f66a43e398 am 81b27f4c: am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev 
* commit '81b27f4c9fcdb1e3379152d08a3abc0fb5e62c53':
  Potential fix for accidental deactivation of profile owner
 2014-12-09 00:18:07 +00:00
ztenghui
6828d32772 am 9bb5cef9: am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev 
* commit '9bb5cef91f82f883a8899dee5fad56111648f1e1':
  AVD: Deep copy the animator target setup when mutate.
 2014-12-09 00:18:02 +00:00
Clare Bayley
d0085ea61c am 2bfb88ca: am fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs 
* commit '2bfb88ca6e84a8fc8d38eb9c4786919cadbbdce3':
  Updating screenshots to LMP release and N6
 2014-12-09 00:17:57 +00:00
RoboErik
e8dc96e103 am 0713f944: am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev 
* commit '0713f9449306b6a08ca8102f76452db270b6486a':
  Make setting the session token in MediaBrowserService synchronous
 2014-12-09 00:17:53 +00:00
Dan Sandler
36d2b5fdf4 am c92c94a5: am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit 'c92c94a5b645805372cf1c9d11d9d19dcd71ad91':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-09 00:17:48 +00:00
Benjamin Franz
9c0e993d4e am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit 'f4a76651b0fec69242822e57441b1a937fb6daf3':
  Change the routing path of bluetooth headset connections.
 2014-12-09 00:17:44 +00:00
Justin Harrison
18b4204ee5 am 79e346fe: 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 '79e346fe1bdb4f03e318c9f7ff3b3c7178800413':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-09 00:17:39 +00:00
Raph Levien
00c55cf940 am 72ebd648: am 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev 
* commit '72ebd648b790b524a9ba96c924c57193c31b5052':
  Add 8 more scripts to the font fallback chain.
 2014-12-09 00:17:35 +00:00
Dongwon Kang
f614ca017a am 6077acaf: am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev 
* commit '6077acaf14899fc6dacb4bd73337e4a22b5e2b01':
  TIF: handle a race condition when a session is crashed
 2014-12-09 00:17:28 +00:00
Dongwon Kang
00274f76cd am 46e18c1d: am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev 
* commit '46e18c1d4159e1d34197d756e5df6a3d2e60ad04':
  TIF: increase the time threshold for tune operation which was too harsh
 2014-12-09 00:17:23 +00:00
Filip Gruszczynski
0b6ccb4102 am 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev 
* commit '5ae61a811afca4fa7ddca1e4693f0b84fd09a6dc':
  Private Window flag to disable touch events in WallpaperService.
 2014-12-09 00:17:18 +00:00
Ricardo Cervera-Navarro
c6b1e5f103 am e2c8b5ba: am 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs 
* commit 'e2c8b5ba1cb39533464f52bda3ee59334737014d':
  Revert "docs: Long press to dismiss fix by Wayne"
 2014-12-09 00:17:14 +00:00
Raph Levien
e04cfa8aa5 am 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev 
* commit '1918d0276ad502e45944bd75a187dd22021790c5':
  Change Linkify leniency to VALID
 2014-12-09 00:17:09 +00:00
Nancy Chen
3f1ef75553 am 8940955a: am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev 
* commit '8940955a0878b777309e5171ad899562d3c58406':
  Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)
 2014-12-09 00:17:04 +00:00
Dianne Hackborn
88b08582af am 34e7003a: am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev 
* commit '34e7003a78005e86326c86345561e986978723c6':
  Fix issue #18593636: Turn on "kill important processes that...
 2014-12-09 00:16:59 +00:00
Alan Viverette
d505fb7917 am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs 
* commit '5f5e13d07fcf7531c0bb61f147732a430ad5aeda':
  Avoid extra saveLayer calls in RippleDrawable, fix docs
 2014-12-09 00:16:54 +00:00
Svetoslav
f2cc4e95b5 am f477aeb3: am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched. 
* commit 'f477aeb367f05a64a03ed09efc9e0a9d6f9a6ec2':
  Ensure all events from a showing window are dispatched.
 2014-12-09 00:16:48 +00:00
Lajos Molnar
ceabd79c4b am 967da505: am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev 
* commit '967da505b2cb96ed85161fd940dbecb467bfe38c':
  media: allow full range of Vorbis sampling rates
 2014-12-09 00:16:43 +00:00
Jinsuk Kim
abe3d45b21 am 3f771d87: am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev 
* commit '3f771d879cb75a4d8e3b1a2d98f02f76c16cccd1':
  CEC: Introduce the retry for commands on the new device discovery.
 2014-12-09 00:16:37 +00:00
Dianne Hackborn
e68249c0e1 am 7039f6b4: am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev 
* commit '7039f6b423d2795eea6bebc932c9cb0d8422de88':
  Add test for isolated services.
 2014-12-09 00:16:31 +00:00
Nick Chalko
420f4bd396 am b7459df4: am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev 
* commit 'b7459df472d74d1a1e6ba46b4a72409f984ebd98':
  docs: Fix typo, use --> user
 2014-12-09 00:16:25 +00:00
Chet Haase
dda0529bd5 am 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev 
* commit '0a8cc945ce92263ae8b66db7d08c224865b34470':
  Fix seeking behavior
 2014-12-09 00:16:20 +00:00
Joe Fernandez
c7a34fc777 am 29fb654e: am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs 
* commit '29fb654ee95a4c11c8db70c7c9c6133a161672f2':
  docs: Fixes for App Indexing training class
 2014-12-09 00:16:15 +00:00
Luan Nguyen
2abab3dc2f am 4d1b8b6c: am 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs 
* commit '4d1b8b6c290973c3f58dd9eb1e164fa8b08d93c0':
  docs: Update MessageAPI notes to mention the unreliable transmission nature.
 2014-12-09 00:16:11 +00:00
smain@google.com
f701ff12b8 am 1bef46b9: am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs 
* commit '1bef46b9b3118f4fd204e3f9ff534f36cb27a706':
  update L Preview message and disallow crawling /preview
 2014-12-09 00:16:06 +00:00
Zhentao Sun
af67d49865 am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev 
* commit 'b97782f2dac9714e4b6037a6d82a259f32816a5a':
  Fixed a leak in GeofenceHardwareImpl.java.
 2014-12-09 00:16:01 +00:00
Raph Levien
1a91d8df50 resolved conflicts for merge of b9d21d62 to master 
Change-Id: I2936c2a47290c3ea0fc66d460215f9e75d17ebf2
 2014-12-08 13:46:15 -08:00
Jason Monk
8f51036c45 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-12-08 20:29:25 +00:00
Jason Monk
1bcdba7b1a am 0538e675: am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 
* commit '0538e675db393777ca1090725b71d54d78fce007':
  Make CarrierText handle multi-sim
 2014-12-08 20:29:16 +00:00
Geoff Mendal
daf1af386a Merge "Import translations. DO NOT MERGE" 2014-12-08 20:29:13 +00:00
Geoff Mendal
d408f3b9b4 Import translations. DO NOT MERGE 
Change-Id: I53629d1cb87f02a6602c5b311fa7cea218745da2
Auto-generated-cl: translation import
 2014-12-08 12:14:50 -08: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