Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,201 Commits 3 Branches 0 Tags
f1c91fec09c3ed9ec0dcafe10ed2942d91d2a975
Commit Graph

44883 Commits

Author SHA1 Message Date
Matthew Williams
bbd04c6956 am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit 'f390c6ac2f65573e863fb563ded7ecdb3e839be4':
  Add timeout when waiting to bind to JobService
 2014-09-03 18:01:47 +00:00
George Mount
54aa32cb01 am 62667650: Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 
* commit '626676503844d2a90792011cd23b099109c8c9d7':
  Fix ChangeTransform to work with interruptions
 2014-09-03 17:49:57 +00:00
George Mount
7e492f2007 am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev 
* commit 'dd8159896d9ebc138a01f538445280e5a1d5adae':
  Additional fixes for "back" with translucent windows.
 2014-09-03 17:49:54 +00:00
Esteban Talavera
64492996c8 am 5607db79: Merge "Pass ComponentName to probing certificate methods" into lmp-dev 
* commit '5607db79a3c17d948e717debc74a936ea47c1de8':
  Pass ComponentName to probing certificate methods
 2014-09-03 17:49:45 +00:00
Wally Yau
c3a65a17fa am afa51609: Merge "New keycode definitions for TV remotes." into lmp-dev 
* commit 'afa516092430324283256b568fe6b91fb88e82c8':
  New keycode definitions for TV remotes.
 2014-09-03 17:49:28 +00:00
Matthew Williams
5bdc16974a Merge "Add timeout when waiting to bind to JobService" into lmp-dev 2014-09-03 17:49:07 +00:00
George Mount
705dedb2f5 am aecaeaf1: am 62667650: Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 
* commit 'aecaeaf1b06ef68b074e719b2efae1b7525a70b1':
  Fix ChangeTransform to work with interruptions
 2014-09-03 17:48:12 +00:00
George Mount
31dce2b27f am 1a91de15: am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev 
* commit '1a91de154e18d54b07d2c51da7f74c8f4590e8a0':
  Additional fixes for "back" with translucent windows.
 2014-09-03 17:48:07 +00:00
Matthew Williams
75fc5258b7 Add timeout when waiting to bind to JobService 
BUG: 17322886

bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.

Also made the javadocs clearer for the JobScheduler class.

Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
 2014-09-03 10:47:27 -07:00
Esteban Talavera
6bf9c6350a am 67330f8c: am 5607db79: Merge "Pass ComponentName to probing certificate methods" into lmp-dev 
* commit '67330f8c077570c870846b7618b5196827483c84':
  Pass ComponentName to probing certificate methods
 2014-09-03 17:37:01 +00:00
Wally Yau
a5aa2b913b am 77f65a70: am afa51609: Merge "New keycode definitions for TV remotes." into lmp-dev 
* commit '77f65a70035e07c29fe74cf08bb9e7efe9b144c7':
  New keycode definitions for TV remotes.
 2014-09-03 17:36:48 +00:00
George Mount
66946e22b1 Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 2014-09-03 17:30:24 +00:00
George Mount
d847f1a1e3 Merge "Additional fixes for "back" with translucent windows." into lmp-dev 2014-09-03 17:30:09 +00:00
George Mount
99c82fd1de Additional fixes for "back" with translucent windows. 
Ensure background is mutated before changing its alpha.
Ensure resetViews is called when activity options is set.

Bug 16215650

Change-Id: I8482532777652a93b2c0d05c1b902516d281baf0
 2014-09-03 17:29:57 +00:00
George Mount
dc19ac008c Fix ChangeTransform to work with interruptions 
Bug 17372872

If ChangeTransform was interrupted after its animation completed,
but before the parent's Transition completed, it would think
that its start location was relative to its parent's current
position and not relative to its end position.

Change-Id: Iad25aafc03c41c1e0a7530548fb38acafbaffb8e
 2014-09-03 17:29:06 +00:00
Dake Gu
fa28163129 am e3842811: am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'e384281179ad3a71fcb16e071fa4a575b3e7926c':
  ActivityTransition: fix activity not finished on back
 2014-09-03 17:26:00 +00:00
Esteban Talavera
aa924b52e9 Merge "Pass ComponentName to probing certificate methods" into lmp-dev 2014-09-03 17:22:41 +00:00
Dake Gu
f01a449630 am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'a45b03f85cdfa792122a9301d508e106ce6aa6f6':
  ActivityTransition: fix activity not finished on back
 2014-09-03 17:16:57 +00:00
Wally Yau
a25d54ffb0 Merge "New keycode definitions for TV remotes." into lmp-dev 2014-09-03 17:15:50 +00:00
Dake Gu
dd725ec4a7 Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 2014-09-03 17:07:09 +00:00
Brian Carlstrom
a27e31a003 am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit 'ef3d85a5d9de21c4569cc1bec4e696bbf44623a6':
  Fix DevicePolicyManager javadoc
 2014-09-03 17:06:17 +00:00
Chet Haase
a4673b1c74 am c22d9103: Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 
* commit 'c22d910342406a71094ace8f10a898ea9de360ca':
  Fix TransitionManager.go() to allow null transitions
 2014-09-03 17:05:29 +00:00
George Mount
ddc5bd84b6 am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '10e15c3ad6d5395c38c73b72aff4267eed0a66b8':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 17:05:03 +00:00
Christoph Studer
717ad1da29 am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '342ece751b683d4532e273f196f4f99dfc569067':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 17:04:38 +00:00
Sander Alewijnse
66b4040c05 am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit '727738ada473ae5e905a1c3c38f136b2669f6b5e':
  Add the provisioning extra admin extras bundle.
 2014-09-03 17:04:33 +00:00
Yohei Yukawa
b2745fabdd am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'ebb6b4224ee02b2ef7ae5d58c9e7cdf3ab16b090':
  API Review: InputConnection
 2014-09-03 17:04:21 +00:00
Lorenzo Colitti
1548796fbf am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '1ae4e750dd822edda13ee68c827f977b6e533fc5':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 17:04:11 +00:00
Svetoslav
ac92df0a05 am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit '551335a38d0214e739571193369d6e476d9ff75b':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 16:43:31 +00:00
Alan Viverette
e368dc6208 am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev 
* commit 'b975fe8793329ad3543b4d2462bf42db524ed161':
  Fix accessibility events emitted from TwoStatePreference
 2014-09-03 16:42:02 +00:00
Adam Powell
6319a2f12e am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev 
* commit '1b17f9390020b2801c9b4bea0a5ada5fe7bc37df':
  Automatically supply a content description for ToolbarActionBar nav
 2014-09-03 16:41:52 +00:00
Yohei Yukawa
73c9bddee1 am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev 
* commit '667b31d200c5a919909a7c8d677033607d7d33cb':
  API Review: CursorAnchorInfo
 2014-09-03 16:41:44 +00:00
Lorenzo Colitti
154b83c008 am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev 
* commit '910113a91cc62b5840f107f9b41e4a6445d2a155':
  Use per-Network connection pools for openConnection.
 2014-09-03 16:41:08 +00:00
Lorenzo Colitti
bc940e69f1 am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev 
* commit '2c0a5509a7d74c013e63b7056679394811b5e984':
  Pass the socket mark for DNS queries to dnsmasq.
 2014-09-03 16:41:03 +00:00
Alan Viverette
b698a79db4 am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev 
* commit '489e207dcd42e1d4e4c78d7b72138f4a094dfd79':
  Update pointer hotspots to scale for DPI
 2014-09-03 16:40:39 +00:00
Dianne Hackborn
91d6981795 am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev 
* commit '8070053f6266c98bcffca335b4642d415638b05c':
  Add public constant for usage stats app op.
 2014-09-03 16:40:17 +00:00
Raph Levien
0ee15df481 am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 
* commit '2e97ac0cccdb8625385dc2373ce1a0d8e5f18b2c':
  Ensure layout in getExtendedPadding calls
 2014-09-03 16:40:13 +00:00
Brian Carlstrom
a27a0b379d am 66ce8faf: am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit '66ce8faf4cefa5bc9b240c748b60f5eb287f0852':
  Fix DevicePolicyManager javadoc
 2014-09-03 16:28:40 +00:00
Brian Carlstrom
f1fe51b914 Fix DevicePolicyManager javadoc 
Bug: 17126717
Change-Id: Ib1d83a0e2003296ec1e17fa7c43e32c55b044df3
 2014-09-03 09:00:06 -07:00
Chet Haase
688f9161d0 am c26fbab0: am c22d9103: Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 
* commit 'c26fbab03aa7a38ce6310ca01d6f880df62dd0bf':
  Fix TransitionManager.go() to allow null transitions
 2014-09-03 15:43:03 +00:00
George Mount
8021261c89 am 12b7c53c: am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '12b7c53c52c450a0717749ca464805ddfa4277f3':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 15:34:23 +00:00
Chet Haase
95f3bcdce0 Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 2014-09-03 15:19:29 +00:00
Christoph Studer
8f4b3a9119 am 5df1917f: am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '5df1917f8349b842812a5af430862d167a5b0ed6':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 14:56:39 +00:00
Chet Haase
5a7cf3eeeb Fix TransitionManager.go() to allow null transitions 
The doc'd behavior of go() is that a null transition is equivalent
to just switching to a scene with no transition. The actual behavior
was an NPE crash.

Issue #17342291 TransitionManager.go() with null Transition parameter throws NPE unlike documentation

Change-Id: I9416aa6e307f80eefc201ca3264fd64f8587ac2f
 2014-09-03 07:53:15 -07:00
Christoph Studer
535ec6164e Notification: Limit length of accepted strings 
Limit strings to 5K in order to prevent apps from spamming the system
with overly long strings.

Bug: 17363929
Bug: 16151806
Change-Id: Id41e3fcc1ae1bc8ac8dd41d5059c2cc42f86f017
 2014-09-03 16:38:01 +02:00
Sander Alewijnse
75dd22c135 am a0e6069c: am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit 'a0e6069c54b3e505199df50108bf0a38bee17170':
  Add the provisioning extra admin extras bundle.
 2014-09-03 14:35:45 +00:00
Yohei Yukawa
8bb3b4331c am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'd88a1f9790bfaaa6540f65d76827274d716a2539':
  API Review: InputConnection
 2014-09-03 14:35:32 +00:00
Lorenzo Colitti
0c2c72295c am 703c2eb9: am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '703c2eb9924220110d37a386f4783208c7da90bf':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 14:35:20 +00:00
Svetoslav
e09626e454 am a7a98dc6: am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit 'a7a98dc6b88aa757f48f626d6a49ffad22626058':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 14:34:47 +00:00
George Mount
a2327aacac Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 2014-09-03 14:21:47 +00:00
Christoph Studer
1097b15569 Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 2014-09-03 12:28:29 +00:00