Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,098 Commits 3 Branches 0 Tags
eabb274ace1c6dbf73bbb95b1100d01a2e445f4e
Commit Graph

245098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
eabb274ace Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 54c4374 
am: 5480783

* commit '54807836922b0648cc0bda246b7a2eb82493911e':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I950f1eccdff2daaf7fabc2f8492691209b7b3f7a
 2016-04-20 22:13:15 +00:00
Phil Burk
922d88db31 Merge "MidiDevice: do not open ports on closed device" into nyc-dev am: 2faac0d 
am: 10f1740

* commit '10f1740c1cff279518a53c30d4eafe563a452033':
  MidiDevice: do not open ports on closed device

Change-Id: I98ea3953e313bdb6644ce1546e38de7b6dc4f25d
 2016-04-20 22:13:13 +00:00
Fyodor Kupolov
fdb8147b44 Merge "Test coverage for new FBE functionality" into nyc-dev am: 366a457 
am: fb91c83

* commit 'fb91c8315296b9ec0c7a173752c62ca1d38eb4f9':
  Test coverage for new FBE functionality

Change-Id: I2e974d082ed8ced006081714e924dd32c6827904
 2016-04-20 22:13:09 +00:00
Jim Miller
5480783692 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev 
am: 54c4374

* commit '54c4374b4a67fdfbda936e7f4a8a9538e16c3557':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I9f5db7259dc9af79f57d16577c2a9d5481ad31ba
 2016-04-20 21:52:36 +00:00
Phil Burk
10f1740c1c Merge "MidiDevice: do not open ports on closed device" into nyc-dev 
am: 2faac0d

* commit '2faac0d74169ddc1f54f9cd356dc23b96a74c9eb':
  MidiDevice: do not open ports on closed device

Change-Id: I6f98e504d682a5902dd29f5fa54023e7a8bc9814
 2016-04-20 21:52:33 +00:00
Fyodor Kupolov
fb91c83152 Merge "Test coverage for new FBE functionality" into nyc-dev 
am: 366a457

* commit '366a457b6da6caf3d376a8ef0be6a386aee5c216':
  Test coverage for new FBE functionality

Change-Id: I4f271c0046a96642cfb8f5c81ca5c6a7c41d7062
 2016-04-20 21:52:30 +00:00
Ruchi Kandoi
d84169a92f Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev am: 0fea8ad 
am: 4c24df5

* commit '4c24df5a316af94bb51ef2c860322917e8dbf1c4':
  Revert "PowerManager: Adds the Sustained performance API."

Change-Id: Ia93df4f83b8b8f3c428eeae95cefc0cfc6fb26c6
 2016-04-20 21:49:01 +00:00
Shubham Ajmera
6814b51577 Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev am: f3d5a4d 
am: 958e98c

* commit '958e98c62e69e552d10cf133537a1d7125e03abd':

Change-Id: Iae7af44bd7b5b264253f4a891aa3c0c417dfa107
 2016-04-20 21:48:58 +00:00
Chong Zhang
9c0428d7c9 Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev am: 3966fb9 
am: 7f30d90

* commit '7f30d908f1af66d673f723fa47c4292a7f94aa67':

Change-Id: I4055f5964bd0c7ae8e9e8a579e96afc6d09ab949
 2016-04-20 21:48:52 +00:00
Ruchi Kandoi
1faf47e993 Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev am: a645c97 
am: 5e292bf

* commit '5e292bf51f1c6aea579053a9ecbecb718d4f6255':

Change-Id: I01363420af212a215a97f279369f286c1ca66744
 2016-04-20 21:48:43 +00:00
Ruben Brunk
5f474c7fc3 Merge "Add settings for altering VR display behavior." into nyc-dev am: 6ada702 
am: 2fbf2b7

* commit '2fbf2b701e51c21eb837814dbb5e0201337a7b9d':

Change-Id: I874e2d29f451b126ab65818524105d8e44febb9f
 2016-04-20 21:48:34 +00:00
Daniel Estrada Alva
3df2c6c0d6 Merge "Add support for multiple callback registration in." into nyc-dev am: fdb26b9 
am: 9737ba1

* commit '9737ba1153baa902a89ea74fbd209687d62af94b':

Change-Id: I3a11621407ba3852707c341f1ec4b2bb881260b5
 2016-04-20 21:48:26 +00:00
Dongwon Kang
725da2fde7 Merge "TIF: Do not build input list for background user" into nyc-dev am: 4a6bd4b 
am: 9ab7665

* commit '9ab76653da8bcde9229b28c15a4f0f190267d456':

Change-Id: Ic2cce91b8fff0447d6c48a97dae0aca9166773d0
 2016-04-20 21:48:17 +00:00
Julia Reynolds
6358ed75c5 Merge "Align radio buttons with app icon, change text color." into nyc-dev am: 1ff2412 
am: 08738a2

* commit '08738a2f553fed389db81d02c3a93c45945bca74':

Change-Id: I13b6f20f6a48a7221b0c2d590ae36d1f740496e2
 2016-04-20 21:48:05 +00:00
Julia Reynolds
2ac717ed82 Merge "Animate volume dialog expansion/contraction." into nyc-dev am: e86ac2f 
am: 460f707

* commit '460f707e152a8204b14f3ffcb35330aeadc3a4e7':

Change-Id: I06f35e3b66bd30f1cd3363886506ea16084006e3
 2016-04-20 21:47:45 +00:00
TreeHugger Robot
231b2056dd Merge "Only try to add details to zip once." into nyc-dev am: 0304688 
am: 39dd493

* commit '39dd4939ab26469ab2bc63c4a497960df24ec741':

Change-Id: I8da4c5193b451eb93302861856039fac18c51bcf
 2016-04-20 21:47:26 +00:00
Mitchell Wills
6e85435168 Update scan and last network info in the WorkThread am: cf0875a am: c441faa am: 2dbac6c am: de629c7 
am: dde6195

* commit 'dde619510c6c920441a4f1954045aa4759331ef1':

Change-Id: I387b87824e499a201fbee64e6d713396faf28556
 2016-04-20 21:46:09 +00:00
Andreas Gampe
5d004e0ad0 Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev am: 58f2072 
am: c17adf6

* commit 'c17adf62e56f3a42174c81110d170542371a0a25':

Change-Id: I92ebb39ea86928a15db8659debf97bebb923f608
 2016-04-20 21:45:37 +00:00
Trevor Johns
dd3e250c40 Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 
am: c0d2c43

* commit 'c0d2c43a22c9a0feda8d651d432aa3893e0cf952':

Change-Id: I239987188f9bc78b0986b9cf5946decf960c72c4
 2016-04-20 21:45:16 +00:00
Rob Carr
580b1693ef Merge "When restacking IM windows preserve relative order." into nyc-dev am: db973df 
am: 24cd97a

* commit '24cd97aba3cc388ec639a4627e67e96dc4e65ac1':

Change-Id: I6c0218cb177ce43599ff706f89a84764f8ce99d7
 2016-04-20 21:45:00 +00:00
Rob Carr
caf89b9333 Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev am: 5a2554a 
am: 287dfb6

* commit '287dfb665a04822513d4c1522abaa04c58c60c76':

Change-Id: I237aee62a9482fa86260bb4c8d1cac098d880f28
 2016-04-20 21:44:43 +00:00
Yi Kong
5deadb61db Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev am: 8c205b5 
am: 15d254c

* commit '15d254ca74aa054c8eb17f8e8a5fdabaaa9b8daf':

Change-Id: Ib45f938a9604c972651f6eab41ee8c367039665b
 2016-04-20 21:44:26 +00:00
Sudheer Shanka
463d13819c Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev am: df9ecfc 
am: 6aea488

* commit '6aea4883c05f525efff9fb5224bee3bfdad9d244':

Change-Id: Icb2c53901885317bf87d0e02dd9ecd5a64ec5c6f
 2016-04-20 21:44:07 +00:00
Jae Seo
c9728a2c88 Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev am: 801d416 
am: b3f8a96

* commit 'b3f8a968e27779a0f4cfe0864af4df6f8bdbefe0':

Change-Id: Icce3264882498f0690e508ba71b2ab08a2cd4bdf
 2016-04-20 21:43:47 +00:00
Sudheer Shanka
31052265b8 Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev am: 205d10b 
am: fc6317d

* commit 'fc6317db844fe6c6fbc549461ff02070e8b06af4':

Change-Id: I405e258e02efc852e65d27eaf4c3d0bf45f26b45
 2016-04-20 21:43:27 +00:00
Jason Monk
e1676cea27 Merge "Daydream -> screen saver" into nyc-dev am: eeaaf26 
am: 22c837e

* commit '22c837e8fc2f67bb90a871e9fb818e41c6ac4c74':

Change-Id: I834d0da5a498860f06de820a643f9ffa365af468
 2016-04-20 21:43:05 +00:00
TreeHugger Robot
a5394c9cb9 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba 
am: eac7508

* commit 'eac7508a543f54a5e750557af0bd68735a961fac':

Change-Id: I2b3381b6f351a3f9dffa2b0ae1c2d50688b9ad85
 2016-04-20 21:42:40 +00:00
Jason Monk
fad4436edf Merge "Allow QS details to scroll when the screen is really small" into nyc-dev am: 10ea519 
am: 3defe5a

* commit '3defe5a4bbb4fcf5436e06185c7f040923284f1d':

Change-Id: Id646cf41c2999b6d5cf02f61b8ab285b6c4de39c
 2016-04-20 21:42:10 +00:00
Vladislav Kaznacheev
4aadbc2940 Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev am: c8df6aa 
am: b1b9297

* commit 'b1b9297d61912d63f8bb481edc93b3f1ee42f736':

Change-Id: I4909bcdb20ab388b950334e2051b9eab0cf9c27f
 2016-04-20 21:41:24 +00:00
Jason Monk
7564159f75 Merge "QS tile lifecycle management" into nyc-dev am: e59bbb0 
am: 88edcf7

* commit '88edcf7ed3aba312e516c227b52371e9fe84c5b8':

Change-Id: I91568349ec1005c2df12deab741025a971f57003
 2016-04-20 21:40:28 +00:00
Yang Ni
aca4079cd4 Merge "Made Element accessors thread-safe" into nyc-dev am: c74d2a8 
am: 044d92c

* commit '044d92c5c50685ad07cd56eac79356982286b17b':

Change-Id: I1de36c2261cd41959aef7ceab4fcff75b353bbeb
 2016-04-20 21:40:06 +00:00
Phil Weaver
d202c8c04a Merge "Clear calling identity when binding a11y services" into nyc-dev am: b72c306 
am: 7e0e9dd

* commit '7e0e9dd586202f059a245dfd3f6474e870e962f4':

Change-Id: I4680a924627fdcc22ca7b362b744e4a1daa4edeb
 2016-04-20 21:39:44 +00:00
Jim Miller
54c4374b4a Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev 2016-04-20 21:33:15 +00:00
Shubham Ajmera
320276c8d9 Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev am: f3d5a4d 
am: e2135ff

* commit 'e2135ff6d3a894ebe71c44da5f523835fbf6001f':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: I6d0c99029ea910b4f4c81e3ec15bea44f194e1e6
 2016-04-20 21:17:53 +00:00
Chong Zhang
060eeca69b Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev am: 3966fb9 
am: 35e1368

* commit '35e13681e9c175f655596dc8a240d6b19be5ed71':
  Fix IME adjust when stack focus changes while IME is visible

Change-Id: I9b72a9f36e43d0fd708117b98f8373590c813e7d
 2016-04-20 21:17:43 +00:00
Fan Zhang
242b4c6a31 Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev 
am: b6060a3

* commit 'b6060a3fbc9b1144aa515d17c67bb68eefb83893':
  Allow fragments set their own header view below actionbar.

Change-Id: I7958885f68dd6c1de54fb86fe6838ffcea6b6c45
 2016-04-20 21:17:30 +00:00
Ruchi Kandoi
a78d8d303e Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev am: a645c97 
am: 75da7b4

* commit '75da7b4ad041586d1a7a086467a6e6a76516e15f':
  window: Adds a Sustained Performance Mode window flag.

Change-Id: Id029aa2f10e4d278c385487739978075607f29a1
 2016-04-20 21:17:12 +00:00
Ruben Brunk
04121ec122 Merge "Add settings for altering VR display behavior." into nyc-dev am: 6ada702 
am: 5356c87

* commit '5356c871ac1d8ce2ee0de79e24c450d6907e70bb':
  Add settings for altering VR display behavior.

Change-Id: I35e79e9ba7517d05a0737e4974286a6a341c9640
 2016-04-20 21:16:51 +00:00
Daniel Estrada Alva
a916bd9639 Merge "Add support for multiple callback registration in." into nyc-dev am: fdb26b9 
am: be80c9b

* commit 'be80c9bb5a028acb1a333efa07b0dcf6aff34c2c':
  Add support for multiple callback registration in.

Change-Id: I183cb869aefe6aaa06ac2079cf41c981ac8fe81c
 2016-04-20 21:16:37 +00:00
Dongwon Kang
6bcb65d697 Merge "TIF: Do not build input list for background user" into nyc-dev am: 4a6bd4b 
am: 2a5f69b

* commit '2a5f69b8c84d269be2f2ca71cdb5164308d4f967':
  TIF: Do not build input list for background user

Change-Id: Iaafbadb6d088ed072241c78b82c4aeb84bc8562d
 2016-04-20 21:16:28 +00:00
Julia Reynolds
c3777caa71 Merge "Align radio buttons with app icon, change text color." into nyc-dev am: 1ff2412 
am: 87ea43b

* commit '87ea43b890ee6e207460763b6bf104048bf58ad3':
  Align radio buttons with app icon, change text color.

Change-Id: Ibfbab9183aa1cbffa6addb0a1c2b6b8807c4299f
 2016-04-20 21:16:18 +00:00
Julia Reynolds
515aa1def2 Merge "Animate volume dialog expansion/contraction." into nyc-dev am: e86ac2f 
am: f825573

* commit 'f825573e014cd4ed493410d97b6d6294dd669ad3':
  Animate volume dialog expansion/contraction.

Change-Id: I723d5f05b08519e2abb51b915ea638731ae42820
 2016-04-20 21:16:06 +00:00
TreeHugger Robot
80d5aef051 Merge "Only try to add details to zip once." into nyc-dev am: 0304688 
am: 01c93c4

* commit '01c93c476ab5ed299e99eaeed3ce962a9cd6f1fe':
  Only try to add details to zip once.

Change-Id: I6df023671a41d3bc7762d74c1b3b875332b56483
 2016-04-20 21:15:54 +00:00
Mitchell Wills
115cb0b39e Update scan and last network info in the WorkThread am: cf0875a am: c441faa am: 2dbac6c am: de629c7 
am: ef2bf66

* commit 'ef2bf66598285bf8612f7fd0d9bf977fe2dcd14d':
  Update scan and last network info in the WorkThread

Change-Id: If2fe59775e0c2e8ea0592b1c561ef50346e382bf
 2016-04-20 21:15:41 +00:00
Phil Burk
2faac0d741 Merge "MidiDevice: do not open ports on closed device" into nyc-dev 2016-04-20 21:15:33 +00:00
Andreas Gampe
798372384e Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev am: 58f2072 
am: 6ce2774

* commit '6ce27741799f0059e343cde5e0fbef9073c60ee8':
  Frameworks/base: Add holder to BaseBundle

Change-Id: Ia4053ed3e376a08dbe8f1273d86c3ebdb2cca388
 2016-04-20 21:15:26 +00:00
Trevor Johns
e1b56701fd Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 
am: 254f1b8

* commit '254f1b8a43480749b7061129289d34bc15d345a5':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf
 2016-04-20 21:15:11 +00:00
Ruchi Kandoi
4c24df5a31 Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev 
am: 0fea8ad

* commit '0fea8ad44748abd031c2e73cd5e6bce6a086c5f3':
  Revert "PowerManager: Adds the Sustained performance API."

Change-Id: I7a5d0be180f9c224b9ccb2551ab4f0dbf7c9c4e9
 2016-04-20 21:14:59 +00:00
Rob Carr
4450987a23 Merge "When restacking IM windows preserve relative order." into nyc-dev am: db973df 
am: ab344b8

* commit 'ab344b84e2a96707720d19feb642e57b4b827976':
  When restacking IM windows preserve relative order.

Change-Id: Ie0ef57d3a66036ad850b7016ecad345d2d8886c2
 2016-04-20 21:14:56 +00:00
Shubham Ajmera
958e98c62e Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev 
am: f3d5a4d

* commit 'f3d5a4dd60b3ec461e4d9fee97ce99a92cb29b1b':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: I4b34b2effa629b184ca50453c673b61ea3d6a47b
 2016-04-20 21:14:55 +00:00