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

32887 Commits

Author SHA1 Message Date
Todd Poynor
50ae385894 BatteryService: remove dumpsys-only info duplicated by systemhealth 
Change-Id: I7fa605304b5f62ea19bcf3851d11abe7bf6c83f5
 2013-10-23 00:15:08 +00:00
Costin Manolache
ec1bd6e5b2 Merge "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)" 2013-10-22 20:24:26 +00:00
Matthew Xie
3f96fdd861 am 46cfa691: am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 
* commit '46cfa691379af957cabecac83ae909ba83f93a8f':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
 2013-10-21 16:11:07 -07:00
Matthew Xie
46cfa69137 am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 
* commit '9a53fbe44fcf4b3fe740e8b68ad16f2016aca62c':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
 2013-10-21 16:07:53 -07:00
Matthew Xie
ce39e8ced8 Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 2013-10-21 22:58:53 +00:00
Matthew Xie
ac2c6c3a16 Change pairing api/intent permission from PRIVILEGED to ADMIN 
The APIs are createBond, setPin, setPairingConfirmation
The intent is ACTION_PAIRING_REQUEST
bug 11101076

Change-Id: I3a314efd973b3ce078ab5347159c336f222d9f15
 2013-10-21 14:56:33 -07:00
George Mount
e6702cb0f6 Merge "Add ofArgb to ObjectAnimator and ValueAnimator." 2013-10-21 21:13:08 +00:00
Deepanshu Gupta
e9293c1a1f am 7d641de1: am a14f25c5: am bf3acff1: Merge "Don\'t run the async query if being rendered in EditMode." into klp-dev 
* commit '7d641de1f6ca4af977233220590d1e74be970dab':
  Don't run the async query if being rendered in EditMode.
 2013-10-20 20:00:49 -07:00
Deepanshu Gupta
7d641de1f6 am a14f25c5: am bf3acff1: Merge "Don\'t run the async query if being rendered in EditMode." into klp-dev 
* commit 'a14f25c5ef85c026ff575bf7671d8dab8219ae89':
  Don't run the async query if being rendered in EditMode.
 2013-10-20 19:57:47 -07:00
Deepanshu Gupta
bf3acff10a Merge "Don't run the async query if being rendered in EditMode." into klp-dev 2013-10-21 02:51:20 +00:00
Scott Main
942d0d6a8c am 48f2a25a: am e26c353c: am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev 
* commit '48f2a25a7ffd2c89ca54e7b1873545a4e3b476f4':
  add xml attributes to IME javadoc
 2013-10-20 15:34:59 -07:00
Scott Main
48f2a25a7f am e26c353c: am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev 
* commit 'e26c353c4b32f252567887ddb97051546998c6ff':
  add xml attributes to IME javadoc
 2013-10-20 15:32:24 -07:00
Scott Main
bab3348fc3 Merge "add xml attributes to IME javadoc" into klp-dev 2013-10-20 22:28:11 +00:00
Nick Kralevich
47d2b61ddb fix javadoc building. 
Change-Id: I2f20b026f5438539ad459a5962da950598158728
 2013-10-19 10:43:55 -07:00
Nick Kralevich
69002ae2a2 Fix build. 
Change-Id: Icf14e63d759b021b5f9f79f09efa1d101764b9b7
 2013-10-19 08:43:08 -07:00
Jonathan Dixon
1ec0c91f40 am 72950e65: am d47be031: am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev 
* commit '72950e65c87b2956446d1e7b9dbdc02ef3841774':
  Restore 4 classes that were accidentally deleted
 2013-10-18 17:42:18 -07:00
Jonathan Dixon
72950e65c8 am d47be031: am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev 
* commit 'd47be031378e2ff43d61099ce5502f9428242eaf':
  Restore 4 classes that were accidentally deleted
 2013-10-18 17:40:44 -07:00
Svetoslav Ganov
e9ffeac138 am 8a51e2f4: am a53e1f81: am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit '8a51e2f48cb24113e8463eb251a097080eb46a7f':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:35:31 -07:00
Jonathan Dixon
43e533dea9 Merge "Restore 4 classes that were accidentally deleted" into klp-dev 2013-10-19 00:35:23 +00:00
Svetoslav Ganov
8a51e2f48c am a53e1f81: am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit 'a53e1f81380c018705dc56ee82ec2db155f23489':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:32:57 -07:00
Svetoslav Ganov
237575278d Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 2013-10-19 00:26:44 +00:00
Jonathan Dixon
74fc73f62b Restore 4 classes that were accidentally deleted 
Bug 11291911

These deleted classes were previously public APIs and so need to remain
in the build (but hidden) in order to keep existing apps working.
(Partially reverts Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d)

Change-Id: I28e53b056f41e66645136f5e18fba2ff55a65fe5
 2013-10-18 17:10:34 -07:00
Scott Main
5df0631003 add xml attributes to IME javadoc 
Change-Id: I7a3505753188ba23777391a286d8595ed64777cb
 2013-10-18 16:09:51 -07:00
Scott Main
200223cd0e am 24512c85: am 6f756e56: am 96844ed8: fix javadoc link 
* commit '24512c8586f8a3e0d3c9bff07639f968fe1b3e25':
  fix javadoc link
 2013-10-18 14:56:37 -07:00
Scott Main
24512c8586 am 6f756e56: am 96844ed8: fix javadoc link 
* commit '6f756e561a835d2508b8da71f23075ab7bd1060b':
  fix javadoc link
 2013-10-18 14:54:11 -07:00
Scott Main
96844ed886 fix javadoc link 
Change-Id: I509fb12393ee0b8bf78ff4110fc18420739f7c58
 2013-10-18 14:43:02 -07:00
Svetoslav Ganov
858a1850e2 Hide the print dialog if the printing activity is destroyed. 
1. For an app to print it creates a PrintDocumentAdapter implementation
   which is passed to the print dialog activity. If the activity that
   created the adapter is destroyed then the adapter, which may rely on
   the activity state, may be in an invalid state. For example, an app
   creates an adapter and calls print resuting in the app activity and
   the print dialog activity being stacked. Now the user rotates the
   device which triggers the recreating of the activity stack (assume the
   app does not handle rotation). The recreated print dialog activity
   receives the intent that originally created it with containing the
   adapter that was constructed in the context of the old, now destroyed,
   app activity instance.

   To handle this we are limiting an app to be able to print only from
   and activity and when this activity is destroyed we mark the adapter
   as invalid which will result in hiding the print dialog activity. Note
   that if the app process is killed we already handle this in the print
   dialog activiy by registering a death recipient on the adapter binder.

2. In the PrintManager.PrintDocumentAdapterDelegate some of the state is
   accessed only on the main thread and some from miltiple threads. The
   code was trying to avoid locking for state that is not accessed by
   multiple threads but this is error prone and the benefit does not
   justify the complexity and added fragility. Now grabbing a lock all
   the time.

3. The PrintJobConfigActivity waits for it to bind to the print spooler
   service before instantiating its print controller and editor. However,
   these can be accessed by invoking some of the activity cycle callbacks.
   This change is adding null checks for the case where the activity
   callbacks are called before the binding to the spooler is completed.

bug:11242661

Change-Id: Id906b3170e4f0a0553772dfa62686f06fdca0eaf
 2013-10-18 13:12:06 -07:00
Deepanshu Gupta
34e9c69658 Don't run the async query if being rendered in EditMode. 
Skips the QueryHandler if the QuickContactBadge widget is being rendered
in edit mode.

Bug: 11288332
Change-Id: I04b115292f61afc7f515787fa4a396bc6ea56a16
 2013-10-18 12:07:52 -07:00
Marco Nelissen
c8c2594381 Merge "Add a method to set a list of uids for a wake lock" 2013-10-18 14:28:45 +00:00
Jeff Brown
b1eb620219 am 83bf4404: am 3e3296e5: am 82f31701: Merge "Log view root, input and looper state in bug reports." into klp-dev 
* commit '83bf440440309a394f792e3d8a6acb98197d9d7c':
  Log view root, input and looper state in bug reports.
 2013-10-17 19:28:23 -07:00
Jeff Brown
0c00400fba am 1a53f76d: am 86ca500e: am f10ba7c7: Merge "Make dump messages asynchronous." into klp-dev 
* commit '1a53f76d529bb2c4af05d4cbb7d6967693345788':
  Make dump messages asynchronous.
 2013-10-17 19:16:40 -07:00
Jeff Brown
83bf440440 am 3e3296e5: am 82f31701: Merge "Log view root, input and looper state in bug reports." into klp-dev 
* commit '3e3296e526663306237fe551527146286e14f4e4':
  Log view root, input and looper state in bug reports.
 2013-10-17 19:13:30 -07:00
Jeff Brown
1a53f76d52 am 86ca500e: am f10ba7c7: Merge "Make dump messages asynchronous." into klp-dev 
* commit '86ca500ed14a524c467596cc7c663b88db72038d':
  Make dump messages asynchronous.
 2013-10-17 19:13:16 -07:00
Jeff Brown
82f3170114 Merge "Log view root, input and looper state in bug reports." into klp-dev 2013-10-18 02:08:20 +00:00
Jeff Brown
f10ba7c7dc Merge "Make dump messages asynchronous." into klp-dev 2013-10-18 02:07:18 +00:00
Jeff Sharkey
eeb58c79c0 am 703840da: am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev 
* commit '703840da8a33c703f2d787526438c650b0318845':
  Include external storage devices in DocumentsUI.
 2013-10-17 18:55:22 -07:00
Jeff Sharkey
db289e0ac7 am 47938450: am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev 
* commit '47938450b4d19f60edf774c8f451d53aa110ea0b':
  Plumb through physical device UUID and label.
 2013-10-17 18:55:13 -07:00
Jeff Sharkey
703840da8a am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev 
* commit '1a5804d7aa253432f37fbd5d8eb89ac363501fe9':
  Include external storage devices in DocumentsUI.
 2013-10-17 18:53:26 -07:00
Jeff Sharkey
47938450b4 am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev 
* commit '306bb90d97da583c3728d35073ebcb7f7ca5c467':
  Plumb through physical device UUID and label.
 2013-10-17 18:53:15 -07:00
Jeff Sharkey
0c0f1e2eac Merge "Include external storage devices in DocumentsUI." into klp-dev 2013-10-18 01:46:52 +00:00
Jeff Sharkey
8f4c15d8e4 Merge "Plumb through physical device UUID and label." into klp-dev 2013-10-18 01:45:58 +00:00
Dianne Hackborn
e05df630bc am 9039b9a7: am 63a16e0e: am 6834ae69: Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev 
* commit '9039b9a7efd6d42e842de35d2246971e74753035':
  Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞...
 2013-10-17 18:32:22 -07:00
Dianne Hackborn
9039b9a7ef am 63a16e0e: am 6834ae69: Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev 
* commit '63a16e0e0c4a9691a35f815d5422bdf0fa72efda':
  Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞...
 2013-10-17 18:29:17 -07:00
Dianne Hackborn
6834ae6922 Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev 2013-10-18 01:25:00 +00:00
Dianne Hackborn
09acb7ca89 Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞... 
Well, how about 400.  400 is a real number.

Change-Id: I29ac61b7d629d582c7b68367365a7f81fcf679a2
 2013-10-17 17:28:09 -07:00
Scott Main
2e8e2000d7 am 94dc050f: am 12e067fd: am b38ad76a: additional javadoc for NfcAdapter.ReaderCallback 
* commit '94dc050fb97d5c36c1a6c7e59f5ef6c9e7055b3c':
  additional javadoc for NfcAdapter.ReaderCallback
 2013-10-17 16:13:20 -07:00
Scott Main
94dc050fb9 am 12e067fd: am b38ad76a: additional javadoc for NfcAdapter.ReaderCallback 
* commit '12e067fd38d513e3c6ad3704ada0286347d72b65':
  additional javadoc for NfcAdapter.ReaderCallback
 2013-10-17 16:09:27 -07:00
Alan Viverette
4732783143 am 20fbf7ea: am a74cf4f9: am 280dc0ea: Merge "Fix assorted FastScroller regressions" into klp-dev 
* commit '20fbf7ea91c321e6e8974cc1750b86c6c456ab3c':
  Fix assorted FastScroller regressions
 2013-10-17 14:40:28 -07:00
Scott Main
b38ad76a82 additional javadoc for NfcAdapter.ReaderCallback 
Change-Id: I3cad8b43d53992bb3d53920abb510456ee72afb5
 2013-10-17 11:57:06 -07:00
Alan Viverette
20fbf7ea91 am a74cf4f9: am 280dc0ea: Merge "Fix assorted FastScroller regressions" into klp-dev 
* commit 'a74cf4f962bbd8ae421b56d875f931806afa13ea':
  Fix assorted FastScroller regressions
 2013-10-17 11:36:46 -07:00