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

159830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
4d82f8ad32 am ef629f1f: am a79acc03: Doc change: localized content. 
* commit 'ef629f1f9feada596a0c41b55daa0e859e24312e':
  Doc change: localized content.
 2014-11-20 00:08:05 +00:00
Pavel Zhamaitsiak
0208d3c823 am c7ffe5e2: Merge "TTY over IMS: Add messages about change of TTY mode in the repote device" into lmp-mr1-dev 
* commit 'c7ffe5e2febbdb5abc3da98c6299fde8a61aa106':
  TTY over IMS: Add messages about change of TTY mode in the repote device
 2014-11-20 00:07:55 +00:00
Chet Haase
a79d2e8664 am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 
* commit '85603a7faf0a8067803ae6424bc590f6e2a17e07':
  Fix seeking and scaled duration behavior
 2014-11-20 00:07:50 +00:00
Pavel Zhamaitsiak
c7ffe5e2fe Merge "TTY over IMS: Add messages about change of TTY mode in the repote device" into lmp-mr1-dev 2014-11-20 00:03:35 +00:00
Wink Saville
baf21da1e1 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
 2014-11-19 16:03:09 -08:00
Eric Laurent
46240800f1 am a582bd4b: Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev 
* commit 'a582bd4b42e6bd52cb611bd551d0b60ba1ed664f':
  AudioSystem JNI: fix AudioPortConfig mask usage
 2014-11-20 00:02:12 +00:00
Chet Haase
85603a7faf Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 2014-11-20 00:02:09 +00:00
Dirk Dougherty
ef629f1f9f am a79acc03: Doc change: localized content. 
* commit 'a79acc0315d33080527b9fb48ba063fb4104de37':
  Doc change: localized content.
 2014-11-20 00:02:06 +00:00
Alan Viverette
4247f06ba4 am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 
* commit 'b130d5961cb154e8821cfa42fdd820d67497d84d':
  Remove underline and search icon from ActionBar search view
 2014-11-19 23:57:42 +00:00
Eric Laurent
a582bd4b42 Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev 2014-11-19 23:55:52 +00:00
Alan Viverette
6a6b828090 am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 
* commit '552eca1a713ab8f6c60d6ec0d350ef33813cd25b':
  Implement Material-style delegate for CalendarView
 2014-11-19 23:53:25 +00:00
Alan Viverette
21aaf98f6f am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev 
* commit 'd8dd5100f453b0e82b75c56651889eca03414696':
  Fix several small layout and color issues
 2014-11-19 23:53:17 +00:00
Alan Viverette
b130d5961c Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 2014-11-19 23:52:24 +00:00
Pavel Zhamaitsiak
185062733b TTY over IMS: Add messages about change of TTY mode in the repote device 
Bug: 18247323
Change-Id: Iefd9bfdccc4af2acf06259f9804dbebb576aca12
 2014-11-19 23:52:11 +00:00
Alan Viverette
552eca1a71 Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 2014-11-19 23:51:34 +00:00
Alan Viverette
d8dd5100f4 Merge "Fix several small layout and color issues" into lmp-mr1-dev 2014-11-19 23:50:00 +00:00
Dirk Dougherty
a79acc0315 Doc change: localized content. 
Change-Id: I5440fe8d6003bdd8e3cb4c44bacea422f322c33b
 2014-11-19 23:44:05 +00:00
Chet Haase
0d1c27a713 Fix seeking and scaled duration behavior 
The animation scaled was not being factored in early enough in the
activity lifecycle. Also, setCurrentPlaytTime() was not accounting for
the scaled duration correctly. Finally, added setCurrentFraction() as
a more general-purpose seeking facility.

Issue #18222006 Animator duration scale ignored in some situations
Issue #17951668 add ability to seek fraction, not just time

Change-Id: Idad401f5ff5026d7046c36eee09d78a4793215dc
 2014-11-19 15:29:47 -08:00
smain@google.com
6e08d30da4 am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs 
* commit '555d6e700a84018e1af2e7cf6c58ca00f0611f5d':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-19 23:14:10 +00:00
smain@google.com
555d6e700a am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs 
* commit '2411fe88d7b11f628e5338bd8f314c98a9d45bb4':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-19 23:10:06 +00:00
smain@google.com
2411fe88d7 Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs 2014-11-19 23:06:27 +00:00
Quddus Chong
a1e1890797 am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. 
* commit '8428c114ab58d7a5a11c72583a49d3e1d036623c':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-19 23:05:59 +00:00
Deepanshu Gupta
ddc83dfa8f am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev 
* commit '4104abf875e16ad54c248ce602e573d2144732dd':
  Fix setTextAppearance for styles with dots.
 2014-11-19 23:00:43 +00:00
Deepanshu Gupta
a0bc2e7e3c am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 
* commit '455654cffdaebcbbd4fa33de5bb18fa2752d6c9a':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-19 23:00:39 +00:00
Quddus Chong
8428c114ab am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. 
* commit '9b822b96aaf16ac4ad8e5a1c8da998fba2f3f404':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-19 22:58:30 +00:00
xinhe
29b90ae5fd am 77bfacc6: Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev 
* commit '77bfacc6fe0816e97be3a0f9a824759629d1f9eb':
  Add configuration to control converting sms destination number
 2014-11-19 22:55:37 +00:00
xinhe
77bfacc6fe Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev 2014-11-19 22:50:43 +00:00
Andrew Solovay
9ab79ccd34 docs: Bugfix & minor cleanup for "Providing Messaging for Auto" 
Fixeds the gradle dependency line. Also added in Javadoc links for the
various support classes and methods, and other minor cleanup. See
first comment for doc stage location.

bug: 18439090

Change-Id: I7ccc892f38a644d68abc6d56d8d4377df5f864b0
 2014-11-19 14:48:52 -08:00
Deepanshu Gupta
4104abf875 Merge "Fix setTextAppearance for styles with dots." into lmp-dev 2014-11-19 22:30:20 +00:00
Deepanshu Gupta
455654cffd Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 2014-11-19 22:29:54 +00:00
Dianne Hackborn
ff17024e58 Fix issue with call backs from media process. 
All but a few lines of this is for issue #16013164, which allowed
apps to do some operations as the media uid by having it call
back to them to open a file.  The problem here is with the tempory
identity stuff in the activity manager, allowing us to make the open
call as the original caller...  ideally we should figure out a way
to just get rid of all of that, but the solution here is actually
easier (even though it doesn't look it) -- we now hand a token over
to the openFile() call that it can use when doing permission checks
to say "yes I would like the check to be against whoever is responsible
for the open".  This allows us to do the uid remapping for only this
one specific set of permission checks, and nothing else.

Also fix issue #17487348: Isolated services can access system services
they shouldn't be able to.  Don't send any system service IBinder objects
down for the first initialization of an isolated process.

Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
 2014-11-19 14:29:10 -08:00
Dianne Hackborn
4f0e4a9ada Add new empty app test entry points. 
Change-Id: Ib899c95de6b7bb936d2114e86bec4c5aef5f7eda
 2014-11-19 14:21:07 -08:00
George Mount
2db3bf5c49 Slide supports Gravity.START and Gravity.END. 
Bug 18444396

Change-Id: Id7b82b44948e4501c2b4fb5302d22672fa20cd00
 2014-11-19 14:14:53 -08:00
John Spurlock
61f4f68571 am c70a4ccf: Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev 
* commit 'c70a4ccf45f669c07345cd438d68747d0558fd49':
  BatterySaver: Update disclosure string.
 2014-11-19 22:12:06 +00:00
John Spurlock
c70a4ccf45 Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev 2014-11-19 22:09:14 +00:00
xinhe
b4e8478a73 resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE) 
Change-Id: I83bf149b4905b82e3787097c55b7d3cd026061dd
 2014-11-19 14:04:23 -08:00
John Spurlock
a7b6a278d0 BatterySaver: Update disclosure string. 
Bug: 18451615
Change-Id: Iea8c71a4ef1e3217953672b2a8691d612bacf8a9
 2014-11-19 16:53:52 -05:00
Mathieu Chartier
78f235db2d am 7fc9176c: Add zygote space to Dalvik Heap 
* commit '7fc9176c8a2102fb5be3668404bd15feb6878c89':
  Add zygote space to Dalvik Heap
 2014-11-19 21:51:35 +00:00
Mathieu Chartier
7fc9176c8a Add zygote space to Dalvik Heap 
Broken by
https://googleplex-android-review.git.corp.google.com/#/c/590612/

This change fixes it by correctly putting the zygote in Dalvik Heap
instead of Dalvik Other.

Bug: 18447855

Change-Id: I4a58480f1ef1eb17e760245d8690ce92e28ebea3
 2014-11-19 13:43:40 -08:00
Jason Monk
bdf37b714d am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
* commit '2e982258f10e9af21ec328faf41e77b38b109738':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-19 21:22:29 +00:00
Jason Monk
2e982258f1 Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 2014-11-19 21:18:22 +00:00
Geoffrey Borggaard
db1e7fa097 Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev 
automerge: e4590cf

* commit 'e4590cff5bbe581a1326abe68115b551585c43ff':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-19 20:50:12 +00:00
Vinit Deshpande
a34f3d30c6 am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit '800bf3ae6e9affb151b3b0b368c4a3dd22bb1fa0':
  Fix WPS docs for LABEL method
 2014-11-19 20:29:56 +00:00
Eric Laurent
6368a7df18 AudioSystem JNI: fix AudioPortConfig mask usage 
Bug: 18444838.
Change-Id: I9151538399001c719b9e0681c00d47a26928896c
 2014-11-19 12:18:32 -08:00
Vinit Deshpande
800bf3ae6e Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 2014-11-19 20:17:22 +00:00
Alan Viverette
7573f496a1 Fix several small layout and color issues 
Adjusts switch track asset for consistent alignment across DPI buckets,
adjusts edit text background. Lightens the "Light" theme action bar
color so that it doesn't blend in with the action bar shadow.

BUG: 18430444
BUG: 18356558
BUG: 18390994
Change-Id: I1d1e26239fa0c921a65e4ec8b5df0b0093b3989c
 2014-11-19 11:59:24 -08:00
Geoffrey Borggaard
e4590cff5b Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev 2014-11-19 19:56:48 +00:00
xinhe
62a22d5b1f resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE) 
The change is already in MR1 branch

Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff
 2014-11-19 11:48:43 -08:00
Quddus Chong
9b822b96aa docs: Added link to CarExtender class from Auto Getting Started doc. 
Change-Id: Ia446c969a7108d8964c22958cd501b083a84b9d3
 2014-11-19 11:37:18 -08:00
Geoffrey Borggaard
ba45b96a37 Setting ADB_ENABLED may result in a SecurityException. 
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477

Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
 2014-11-19 14:26:08 -05:00