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

154870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
663edb8bfb am 329bd662: am 3bde32e6: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev 
* commit '329bd662cc0dccaf41d441ea44db2895df48f0df':
  Fixing where call goes from disconnecting to active to disconnecting state.
 2014-10-07 20:55:45 +00:00
Tyler Gunn
329bd662cc am 3bde32e6: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev 
* commit '3bde32e68d201f2dda4a4847d2818c74b120cdbb':
  Fixing where call goes from disconnecting to active to disconnecting state.
 2014-10-07 20:51:51 +00:00
Tyler Gunn
3bde32e68d Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev 2014-10-07 20:46:39 +00:00
Adam Lesinski
18ab83e571 am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit 'f189c445b84365a3f1bd2b678fdca37f9df8d5d1':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:03:24 +00:00
Jason Monk
fc3487cedd am 000b85fa: am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev 
* commit '000b85fa8ca68b530b18a7318f8ac49b76b1114f':
  Hide hotspot tile if 'provisioning' is needed
 2014-10-07 20:03:18 +00:00
Andres Morales
5d62388192 am 4e558355: am 258d2221: Fix build, previous commit failed to remove an import 
* commit '4e5583554151ea95d8d573e3d64947afbc51f34f':
  Fix build, previous commit failed to remove an import
 2014-10-07 20:03:14 +00:00
Andres Morales
6ef845d34a am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 
* commit 'b4589115ad5ca8a98aa8f9b75296502658ae6416':
  Remove dead NFC unlock code from fw/base
 2014-10-07 20:03:09 +00:00
Jorim Jaggi
bc2af9fbcf am c4a7c191: am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev 
* commit 'c4a7c191be3a6fcbff984aa8b54c6378cc94262d':
  Update 'No notifications' text on configuration change
 2014-10-07 20:03:04 +00:00
Adam Lesinski
f189c445b8 am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc':
  Load shared library dependencies for AppWidgets
 2014-10-07 19:58:59 +00:00
Jason Monk
000b85fa8c am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev 
* commit '733bcc7fbe8f03c92f20c57dd25cbc3b011cef9e':
  Hide hotspot tile if 'provisioning' is needed
 2014-10-07 19:58:48 +00:00
Andres Morales
4e55835541 am 258d2221: Fix build, previous commit failed to remove an import 
* commit '258d222152a410341ddad045ce92e57dd7ab454e':
  Fix build, previous commit failed to remove an import
 2014-10-07 19:58:41 +00:00
Andres Morales
b4589115ad am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 
* commit 'd6a2ab930972d5578957ca919abd38fca074deec':
  Remove dead NFC unlock code from fw/base
 2014-10-07 19:58:36 +00:00
Jorim Jaggi
c4a7c191be am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev 
* commit '988a8a9820bb3ae331be4932eb9e672a4614efd5':
  Update 'No notifications' text on configuration change
 2014-10-07 19:58:28 +00:00
Adam Lesinski
1a98dd5cc7 Merge "Load shared library dependencies for AppWidgets" into lmp-dev 2014-10-07 19:51:17 +00:00
Adam Lesinski
d00bb5edcf Load shared library dependencies for AppWidgets 
PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.

Bug:17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
 2014-10-07 12:14:45 -07:00
Jason Monk
733bcc7fbe Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-dev 2014-10-07 18:53:20 +00:00
Jason Monk
20ef4024ed Hide hotspot tile if 'provisioning' is needed 
If we need carrier entitlement checks don't show the hotspot tile
which could bypass them, instead make the user go to settings.

Bug: 17879554
Change-Id: I30a5b51b26a2d4e977579b71a16c3c7a8d004eea
 2014-10-07 14:43:11 -04:00
Rich Slogar
1b0fba6478 docs:64 bit image and skd update 
Change-Id: I53d3d8e8714cb4689ba80766b155fb1b3ea93484
 2014-10-07 11:40:27 -07:00
Ricardo Cervera
a18075e82b am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'bd964cadd4846d5d954eadb7fcd2a61e51814c65':
  docs: Removing references to self note on Common Intents page.
 2014-10-07 18:38:24 +00:00
Sandeep Siddhartha
b585ac5b5e Add tests for model management [SDK Only] 
This doesn't change any functionality/APIs etc.
It allows us to launch the activity and manually test the enrollment
methods.

Bug: 17885286
Change-Id: I506d9bb98a592131c04a50c9d6224164ffe07183
 2014-10-07 11:24:51 -07:00
Andres Morales
258d222152 Fix build, previous commit failed to remove an import 
Bug:17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
 2014-10-07 11:15:58 -07:00
Andres Morales
d6a2ab9309 Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 2014-10-07 18:11:21 +00:00
Jorim Jaggi
988a8a9820 Merge "Update 'No notifications' text on configuration change" into lmp-dev 2014-10-07 17:48:01 +00:00
Amith Yamasani
4797554ab8 am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit 'b86671f4b8263affaa561796862bd4149235b1d3':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 17:43:08 +00:00
John Spurlock
97e9a034b9 am 2c52c443: am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev 
* commit '2c52c443dcca748279e386160143ae388b19bb66':
  Doze: Avoid pulsing in pockets.
 2014-10-07 17:43:03 +00:00
Jean-Michel Trivi
63b6d3ed1d am 986468a8: am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev 
* commit '986468a8ab77ce1e89247078d4e93a3aaa5d294b':
  Full volume on remote submix for apps that need it
 2014-10-07 17:42:58 +00:00
PauloftheWest
0c58307868 am f7b7b758: am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 
* commit 'f7b7b7585acb0bec5c8ccfd646981a1b9f906f60':
  Fixed a Bluetooth Quick Settings update bug.
 2014-10-07 17:42:52 +00:00
Yorke Lee
a64c571454 am 84e9479a: am 7f22eb98: Merge "Fix build break" into lmp-dev 
* commit '84e9479a09ce7dd9bb0a153ba75fe78554a0c114':
  Fix build break
 2014-10-07 17:42:48 +00:00
Ricardo Cervera
bd964cadd4 docs: Removing references to self note on Common Intents page. 
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
 2014-10-07 10:37:19 -07:00
Amith Yamasani
b86671f4b8 am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 17:33:25 +00:00
John Spurlock
2c52c443dc am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev 
* commit '0d334365c6123388a0df81438b82122be29d19ab':
  Doze: Avoid pulsing in pockets.
 2014-10-07 17:33:10 +00:00
Jean-Michel Trivi
986468a8ab am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev 
* commit 'dce7a427593c6e11277d9e3075ab027512923276':
  Full volume on remote submix for apps that need it
 2014-10-07 17:33:05 +00:00
PauloftheWest
f7b7b7585a am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 
* commit '53c84002911362c913bc72cd28d186718a33149d':
  Fixed a Bluetooth Quick Settings update bug.
 2014-10-07 17:31:39 +00:00
Yorke Lee
84e9479a09 am 7f22eb98: Merge "Fix build break" into lmp-dev 
* commit '7f22eb981812309a1e751a891428dffe6b1da175':
  Fix build break
 2014-10-07 17:31:19 +00:00
Tyler Gunn
4afc6afd20 Fixing where call goes from disconnecting to active to disconnecting state. 
- Adding disconnecting state to telecom used to communicate that a call is
being disconnected to InCall UI (rather than it existing only as a state
in the InCall UI).

Bug: 17821930
Change-Id: I6c2d9521915ba154c0468eea62c12c30060edd2e
 2014-10-07 10:14:55 -07:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
John Spurlock
0d334365c6 Merge "Doze: Avoid pulsing in pockets." into lmp-dev 2014-10-07 16:17:46 +00:00
Jean-Michel Trivi
dce7a42759 Merge "Full volume on remote submix for apps that need it" into lmp-dev 2014-10-07 16:12:08 +00:00
Jean-Michel Trivi
ba5270b887 Full volume on remote submix for apps that need it 
If an AudioRecord is created with the "fixedVolume" tag
  when recording from REMOTE_SUBMIX, treat the
  device DEVICE_OUT_REMOTE_SUBMIX as a fixed full volume
  device during the recording. Also register a death
  handler during the recording.
  Otherwise this is a no-op.

Bug 17635294

Change-Id: I8d26fe777047126f34308e1e1b7ac28ba269ad89
 2014-10-07 09:09:41 -07:00
John Spurlock
92b8d41096 Doze: Avoid pulsing in pockets. 
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.

Bug: 17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
 2014-10-07 12:01:56 -04:00
PauloftheWest
53c8400291 Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 2014-10-07 13:01:28 +00:00
Amit Mahajan
dbbf493220 am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3 
* commit 'd9a3f89a0727590a069c563a8b97fe99b866d67c':
  Sms7BitEncodingTranslator
 2014-10-07 05:12:44 +00:00
Amit Mahajan
d9a3f89a07 Merge commit '69555fc2' into fix-merge-conflict3 
Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
 2014-10-06 21:57:42 -07:00
Ricardo Cervera
6d30f57614 am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '3f7b4d8ff385ce30c6c266f8b0418fc621db2da8':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 04:49:17 +00:00
Ricardo Cervera
3f7b4d8ff3 Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 2014-10-07 04:41:13 +00:00
Yorke Lee
7a394311ad am 770ed6ec: Fix build break 
* commit '770ed6ec920ec10798c5b7a7b4850ccc0b2a531f':
  Fix build break
 2014-10-07 03:31:21 +00:00
Yorke Lee
770ed6ec92 Fix build break 
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit 9858af0ec68ad28db60047587c8eb6232b4a6591)
 2014-10-07 03:13:12 +00:00
Ricardo Cervera
cee4ed8a1d docs: Update Common Intents page with Google Now actions 
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
 2014-10-06 19:16:06 -07:00
Yorke Lee
7f22eb9818 Merge "Fix build break" into lmp-dev 2014-10-07 02:12:02 +00:00
Yorke Lee
9858af0ec6 Fix build break 
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
 2014-10-06 18:58:52 -07:00