Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,504 Commits 3 Branches 0 Tags
62bdf2c86342db66d86ceff3a8c0b609e4570bfc
Commit Graph

48117 Commits

Author SHA1 Message Date
Jorim Jaggi
7d754e0ccb am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'f1e6d2315eea6e9f289b8c1bafc04a4cbc6f05e1':
  Make IKeyguardService interface asynchronous
 2014-11-26 19:42:19 +00:00
Alan Viverette
2346a299a4 am 7c28a968: am c8361ba7: am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 
* commit '7c28a9682bfa2c5bbeee8b4a4c0576fea87eb9b0':
  Revert "Animates AbsSeekBar progress movement from key presses."
 2014-11-26 19:41:48 +00:00
Alan Viverette
a033bb9c73 am ed79856d: am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit 'ed79856db292044a15fe7d3c3227fb9ec808f070':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 19:41:43 +00:00
Jorim Jaggi
f1e6d2315e am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789':
  Make IKeyguardService interface asynchronous
 2014-11-26 18:43:47 +00:00
Alan Viverette
7c28a9682b am c8361ba7: am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 
* commit 'c8361ba78eac66c49d92ff4be36ef23889846ea9':
  Revert "Animates AbsSeekBar progress movement from key presses."
 2014-11-26 18:41:41 +00:00
Alan Viverette
ed79856db2 am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit '30c0d5b5eadecf5ba3c9ee536f153adc4c8c8723':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 18:41:35 +00:00
Jorim Jaggi
d9b91d0d49 resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev 
Change-Id: I194616c947a3366911e932f4c7111097d3767db3
 2014-11-26 15:17:14 +01:00
Jorim Jaggi
803a6dc080 Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev 2014-11-26 14:07:21 +00:00
Paul Crowley
5ff0e5fb6b am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '0d122e265c52ef25dbad652378b3a5e51a86f041':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:09:51 +00:00
Paul Crowley
0d122e265c am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit 'ba94fd5e6c243c6256a1627a41aaab52a74747d6':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:02:37 +00:00
Alan Viverette
c8361ba78e am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 
* commit '0a310c99ee3217567f66578de2d2051e611d39aa':
  Revert "Animates AbsSeekBar progress movement from key presses."
 2014-11-26 00:56:47 +00:00
Alan Viverette
30c0d5b5ea am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit '8a45126a2986fd408dec7c531ee1cadb690aaffd':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 00:56:43 +00:00
Alan Viverette
0a310c99ee Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 2014-11-26 00:52:36 +00:00
Alan Viverette
8a45126a29 Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 2014-11-26 00:52:20 +00:00
Alan Viverette
5ce0ec0efd Revert "Animates AbsSeekBar progress movement from key presses." 
Incorrect implementation that broke the Brightness dialog slider. Reverting
to the previous behavior.

This reverts commit c5c9d0af764f590ae0031b5470192a0a08ca42d1.

BUG: 18510040
Change-Id: I201b1da46be964fcf6f041bb92ef79c335c2d23d
 2014-11-26 00:36:26 +00:00
Alan Viverette
b6e0cb97b7 Load SPEAK_PASSWORD from currently active user rather than self 
Also fixes a typo in UserHandle's docs.

BUG: 18295054
Change-Id: I1f5384f84062b9ea7dcbebe1e5f64af331028d41
 2014-11-25 16:08:03 -08:00
Jim Miller
ab954546dc Make IKeyguardService interface asynchronous 
Add a state callback so lockscreen reports back whenever its state
relevant for PhoneWindowManager changed, instead of synchronously
calling into SysUI which can lead to deadlocks. Directly use
LockPatternUtils for isSecure, and optimize the number of calls to
this method to optimize layout performance.

Bug: 17677097
Change-Id: I5d491fc8884d4f84d9562626b9ea0d5eaa5166fc
 2014-11-25 23:22:52 +01:00
Paul Crowley
ba94fd5e6c am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '77e25331ca7ad1fb69fbe7fbec69179824e46e59':
  Add flag for wiping factory reset protection data.
 2014-11-25 21:18:30 +00:00
Paul Crowley
a7e87acb24 Add flag for wiping factory reset protection data. 
Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
 2014-11-25 20:48:41 +00:00
Adam Lesinski
e1d149d5da am 44a711cc: am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '44a711ccac480aef4e8518284b8a0320e227f2df':
  Make the Context service constant for UsageStats public
 2014-11-25 18:50:57 +00:00
Alan Viverette
65be2b5037 am 11d33527: am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '11d33527e8715f2f6b7317a6424bcb2001778d44':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 18:50:48 +00:00
Ruben Brunk
07053cb921 am 7eb6e0e3: am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit '7eb6e0e3954bce374bc9ab7362005063174090b1':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-25 18:50:38 +00:00
Erik Kline
08866fcfa5 Merge "Map TYPE_VPN integer to "VPN" string." 2014-11-25 18:46:37 +00:00
Adam Lesinski
44a711ccac am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '9f692b520255435903c8c1efb7b50f22a80505a5':
  Make the Context service constant for UsageStats public
 2014-11-25 18:44:31 +00:00
Alan Viverette
11d33527e8 am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '44c09f2919d21296c0f020b954621c30d73eba20':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 18:44:20 +00:00
Ruben Brunk
7eb6e0e395 am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit 'c02cdf00e51b9a7ec7b9c74ba7eeb3711ec52213':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-25 18:43:51 +00:00
Alan Viverette
d8eb415d61 am 67c55be3: am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '67c55be39a76fb17cff79d926914a37fe56d452d':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:55:52 +00:00
Alan Viverette
67c55be39a am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '0d05788fd06b24068c269bfa80dd96deafb00357':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:49:53 +00:00
Jeff Sharkey
eb9d22bb3d am c02f304c: am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit 'c02f304c3a1dc45a7e44b9f91b38c62353850d30':
  Introduce revision codes for split APKs.
 2014-11-25 17:49:24 +00:00
Dianne Hackborn
039777e792 am 9fafd0c7: am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '9fafd0c7111f0d0df431f6c0a4f4f5afcdea7b81':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-25 17:48:24 +00:00
Jeff Sharkey
c02f304c3a am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit '58b699c366dea7abc26f34c1e5f1cc6031c04e23':
  Introduce revision codes for split APKs.
 2014-11-25 17:39:16 +00:00
Dianne Hackborn
9fafd0c711 am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '608439df383b40dc0f808e4992b369debaff29cd':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-25 17:36:52 +00:00
Jeff Brown
3a1c4db53e am b56c4263: am 8cac7309: am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit 'b56c4263c73224ea7c0c0580729a5700c1db87d1':
  Make WallpaperService watch the actual display state.
 2014-11-25 15:16:14 +00:00
Sreeram Ramachandran
10fd39001c am 1cb0044e: am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '1cb0044ece9e3db6ca631daff7d225ce60b67f40':
  Delete unused/non-working code.
 2014-11-25 15:16:10 +00:00
Sreeram Ramachandran
b3e20899fe am 19f47022: am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '19f47022e0c89a11ef03c158d19fa294168da360':
  Allow VPNs to specify their underlying networks.
 2014-11-25 15:16:05 +00:00
Sreeram Ramachandran
053ebdb4ea am ca7b0707: am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit 'ca7b07072849fa2e4bf4e074ce1366eb7138befc':
  Eliminate race conditions in UID-based network filtering.
 2014-11-25 15:16:00 +00:00
Adrian Roos
e1d84dd914 am 9a4d0257: am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '9a4d0257beadf53c706afbcb4abc76c17a44ff00':
  Fix DPM.resetPassword("")
 2014-11-25 15:15:35 +00:00
Christoph Studer
18032a083a am fe6d4f09: am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit 'fe6d4f094d2441314bb31fec10b520f80aeb481e':
  Fix MediaStyle API comments
 2014-11-25 15:15:31 +00:00
Jeff Brown
b56c4263c7 am 8cac7309: am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit '8cac73097e3695d22e3529e77048d82f7fa0fb1c':
  Make WallpaperService watch the actual display state.
 2014-11-25 15:10:26 +00:00
Sreeram Ramachandran
1cb0044ece am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '608ea322868385aaa46c20887795e72bf7068479':
  Delete unused/non-working code.
 2014-11-25 15:10:20 +00:00
Sreeram Ramachandran
19f47022e0 am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '4096a3107b070339ba06102a32a368f28a31f9a4':
  Allow VPNs to specify their underlying networks.
 2014-11-25 15:10:14 +00:00
Sreeram Ramachandran
ca7b070728 am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit '1d16570b374ffaea89a3e3d403146008d12e60b9':
  Eliminate race conditions in UID-based network filtering.
 2014-11-25 15:10:08 +00:00
Adrian Roos
9a4d0257be am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '520d20c1a8c2fbd0d6b7fdc19415167a6f45c866':
  Fix DPM.resetPassword("")
 2014-11-25 15:09:24 +00:00
Christoph Studer
fe6d4f094d am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '30646d87f240cd17917ad6d1ae83306d284b58b5':
  Fix MediaStyle API comments
 2014-11-25 15:09:18 +00:00
Jorim Jaggi
cb17416a8d am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp 
* commit '0da89b76402816dade084166a97b1d352ae1f78b':
  Fixed several time related states for secondary users
 2014-11-25 15:04:28 +00:00
Jorim Jaggi
0da89b7640 resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
 2014-11-25 15:34:56 +01:00
Erik Kline
37fbfa140a Map TYPE_VPN integer to "VPN" string. 
Bug: 18439110
Change-Id: I0fa0c9e6a9293ab724e2b5e7d0f586f05cd100c7
 2014-11-25 13:16:58 +09:00
Adam Lesinski
9f692b5202 am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '9be305d146fb422a0e65e5284af2ce081cdc6a69':
  Make the Context service constant for UsageStats public
 2014-11-25 00:56:00 +00:00
Alan Viverette
44c09f2919 am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '27fbf67644bed5d0d590458ad89cee38d8fddeaa':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 00:55:49 +00:00
Adam Lesinski
9be305d146 Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 2014-11-25 00:51:10 +00:00