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

176805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Luan Nguyen
4d1b8b6c29 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 '37579034a14d6442f0765e45b571a20dbcdcb83e':
  docs: Update MessageAPI notes to mention the unreliable transmission nature.
 2014-12-08 19:09:59 +00:00
smain@google.com
1bef46b9b3 am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs 
* commit 'a0ce71166198a6ebf337b7e2439a3db79b7d9ad6':
  update L Preview message and disallow crawling /preview
 2014-12-08 19:09:53 +00:00
Zhentao Sun
b97782f2da am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev 
* commit '4f04cb20cc37d7a70c2a50af97cc6fd6d064bb06':
  Fixed a leak in GeofenceHardwareImpl.java.
 2014-12-08 19:09:36 +00:00
Raph Levien
b9d21d623f am 8de4fb2f: am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev 
* commit '8de4fb2fe53ed7707500d9cdf737953bed3dec7e':
  Fix off-by-one error in computeEllipsis
 2014-12-08 19:09:18 +00:00