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

196220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
f73e4644a3 Merge "Update the sensors group label" into mnc-dev 2015-06-27 00:32:13 +00:00
Dianne Hackborn
d5f387bc5f Merge "Looks like MNC is gonna be API 23." into mnc-dev 2015-06-27 00:29:26 +00:00
Svetoslav
b134c16b37 Update the sensors group label 
bug:21784262

Change-Id: Ib316d09d0a16df732bbb367ea6725fa08c08747d
 2015-06-26 16:50:08 -07:00
Anil Muthineni
627bd99ef6 Merge "Write size of operators in writeToParcel()" into mnc-dev 2015-06-26 23:46:41 +00:00
Amit Mahajan
a1c98021c0 am 293facf4: (-s ours) am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '293facf4bf5b05c043e33589d17df6f1ad1ade26':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:40:44 +00:00
Xiaohui Chen
c915eebbf8 fix temp white list update in device idle 
It appears firewall rules for temp white list is updated differently
from the non temp one. The non temp one will trigger a global update
but the temp one is updating only the uids in the list one by one.
The individual uid firewall rule update does not work well with dozable
chain. This cl moves the dozable chain update logic out and put it where
the white list is updated.

BUG:22094135
Change-Id: I425c82da6231b1ef119664907705d0880365f339
 2015-06-26 16:31:43 -07:00
Anil Muthineni
554beb58db Write size of operators in writeToParcel() 
- So that the operators are read correctly while reading
  from parcel.

Bug: 21563489
Change-Id: Icb5571a261144810f075855372791d4291255eec
 2015-06-26 16:31:00 -07:00
Amit Mahajan
293facf4bf am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'ad6a2da84800e47048a8c2a83eeb343cee6aaa9c':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:26:27 +00:00
Jorim Jaggi
c154abec43 Merge "Don't apply existing keyguard animation to IME window" into mnc-dev 2015-06-26 23:24:03 +00:00
Dianne Hackborn
2e5cad7868 Looks like MNC is gonna be API 23. 
Change-Id: I9c9c62209c949b1a16ed53eafc259e88e2ddb69a
 2015-06-26 16:15:55 -07:00
Amit Mahajan
ad6a2da848 am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '2da8a992cb2afc25ac6df84da449944ea08f0c57':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:12:05 +00:00
Amit Mahajan
37b4546ec0 am 1573d8ef: (-s ours) am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '1573d8efb2ac6a1a2e2a057041200633df2a9717':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:12:03 +00:00
Rich Slogar
cea2b1c725 am 76e42bdd: am 3686e043: am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs 
* commit '76e42bdd05f6defa283f9df12966928328680445':
  docs: manifest merger updates
 2015-06-26 23:06:59 +00:00
Prashant Malani
b29eeb5af1 am b3d02465: am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev 
* commit 'b3d02465f859dbe62b14c787c7de966abd6c7381':
  Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-26 23:06:53 +00:00
Robert Schaub
71647af1ee am cf05e318: am 2a1be1bc: Docs: Added declaration to code fragment Bug: 21030774 
* commit 'cf05e31866e94eb9d8a6f0ee1fb9960ba169e2c1':
  Docs: Added declaration to code fragment Bug: 21030774
 2015-06-26 22:58:37 +00:00
Wei Liu
0adc5f3794 am 83467228: am 6f6326bc: Implement a exponential backoff for NTP time and XTRA data retry. 
* commit '834672285050812d08cd173559382bc5c3e9800a':
  Implement a exponential backoff for NTP time and XTRA data retry.
 2015-06-26 22:58:31 +00:00
Rich Slogar
52d82d7ea9 am 32279219: am fd3b64b8: am b0afc540: docs: Eclipse ADT end-of-life note 
* commit '3227921922b3750e04e309b7cacd55d5f0b5b77d':
  docs: Eclipse ADT end-of-life note
 2015-06-26 22:58:20 +00:00
Rich Slogar
da420f3d79 am 4c96c704: am 7d377c3b: am fa5f184f: docs: studio migration guide 
* commit '4c96c7045e7e4efbf4f7b68f8e3d02a5e9272075':
  docs: studio migration guide
 2015-06-26 22:58:12 +00:00
Sanket Padawe
fdadadba2e Add flag indicating device supporting EAP SIM, AKA & AKA'. 
Bug: 22014309
Change-Id: Ia76507f9fbe607a7cbec126c527840806c0e7851
 2015-06-26 15:57:07 -07:00
Amit Mahajan
1573d8efb2 am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'd98e7c1df774eb86a67310f5cbc0dbdd91f33c19':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:55:47 +00:00
Amit Mahajan
2da8a992cb am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'b98f786c8acfaed27ee733dde0aa0fd255a09afc':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:55:18 +00:00
Svet Ganov
143e118fa9 Merge "Make grant default permission more robust." into mnc-dev 2015-06-26 22:52:55 +00:00
Svet Ganov
ba3ba81eb8 Make grant default permission more robust. 
Change-Id: If492ee3305774419671bbdb72b438c8e540005e9
 2015-06-26 15:42:49 -07:00
Robert Greenwalt
ae3584bd8d Merge "Add Validation logging." into mnc-dev 2015-06-26 22:40:31 +00:00
Mady Mellor
11b64410d9 Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev 2015-06-26 22:36:44 +00:00
Rubin Xu
0a202eac01 Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev 2015-06-26 22:36:13 +00:00
Amit Mahajan
d98e7c1df7 am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '7278b04383cb6c01c2fbb184c560875ab709dea5':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:35:46 +00:00
Amit Mahajan
b98f786c8a am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '5b8976a5eaffe81a742ec2600cf9b63e911f978c':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:34:59 +00:00
Rich Slogar
76e42bdd05 am 3686e043: am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs 
* commit '3686e0430f8366e2f4de867eeabfd1b7fe4aefc0':
  docs: manifest merger updates
 2015-06-26 22:34:49 +00:00
Abodunrinwa Toki
1223a75a67 Merge "TextView: add the "Share" accessibility action." into mnc-dev 2015-06-26 22:32:26 +00:00
Jorim Jaggi
cb26db0878 Don't apply existing keyguard animation to IME window 
Low risk fix, but it remains unclear what the underlying cause is.

This also applies keyguard exit animation to windows on the default
display.

Bug: 21788383
Bug: 22096813
Change-Id: I37dd4b18483c1103f5f2817f4879f080a38bceca
 2015-06-26 22:27:57 +00:00
Rich Slogar
3686e0430f am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs 
* commit '268a7c190c37a7a63bd1134c4dfb8aacf71c211e':
  docs: manifest merger updates
 2015-06-26 22:25:35 +00:00
Amit Mahajan
5b8976a5ea am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '853c61788387c38c1103f26b1c8c028da5676776':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:19:29 +00:00
Amit Mahajan
7278b04383 am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '895eb134751ec1495baa30362a514275624e5843':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:18:01 +00:00
Rich Slogar
268a7c190c am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs 
* commit 'fc7e84b36b77ac95e61bd1736eebdc307ba6e09e':
  docs: manifest merger updates
 2015-06-26 22:11:44 +00:00
Abodunrinwa Toki
1fa8290dbe Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev 2015-06-26 22:09:43 +00:00
Chien-Yu Chen
f09fd213c3 Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev 2015-06-26 22:09:37 +00:00
Abodunrinwa Toki
c107b0ecdc Fix FloatingToolbar flicker in reaction to text cursor blink. 
1. Reposition the toolbar on predraw only when positioning has changed.
2. Update the toolbar popup's position only if the content rect changed.
3. Fix FloatingToolbarPopup.cancelOverflowAnimations().
   The previous implementation wasn't actually cancelling the animation.

(1) is enough to fix the bug. But (2) and (3) fix issues in the
toolbar directly related to this bug.

Bug: 22039189
Change-Id: I84ec793d788f9402a1f8635e68e3344746f6af07
 2015-06-26 15:08:26 -07:00
Chien-Yu Chen
58a152e359 Merge "Camera2: Clarify session callbacks" into mnc-dev 2015-06-26 22:05:05 +00:00
Amit Mahajan
853c617883 am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '791dd2c67466d2d9dafe58b1258e7718e3f30bc0':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:03:46 +00:00
Amit Mahajan
895eb13475 am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '90224355cd6bd54fa7a9ec30c1cecc573104a3e3':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:03:10 +00:00
Rich Slogar
fc7e84b36b Merge "docs: manifest merger updates" into lmp-docs 2015-06-26 21:56:25 +00:00
Jae Seo
001d51496d Use AlertDialog for MediaRouteControllerDialog 
Bug: 19876497, Bug: 21795195, Bug: 22044600
Change-Id: I8ec3b17d026b2690edad4b5c4d61741e29b653db
 2015-06-26 14:47:37 -07:00
Nathan Harold
aaf280b6b1 Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev 2015-06-26 21:47:21 +00:00
Shirish Kalele
869c230c14 Merge "Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo." into mnc-dev 2015-06-26 21:34:47 +00:00
Jorim Jaggi
cc3a46ada8 Also reset assist setting when force stopping assist 
Bug: 20882522
Change-Id: I57725586ab5ff203b378a1e6d2e5e77a47fd2448
 2015-06-26 21:32:08 +00:00
Mady Mellor
a526683d12 Text selection: fix snapping to words when words break across lines 
Some languages do break words across lines and words can break between
lines with hyphenation. If a word has only one character on the current
line with the rest of the characters on the next line, the user would
be unable to move the cursor to the end of the word.

Rather than judging if a user is far enough into a word by using the
full word length, this CL amends the logic to only use the characters
that are on the current line of the word, if the user is far enough into
these characters the handle jumps to the next line to the end of the
word position.

Bug: 21400624
Change-Id: I8b96eb83bea08d9794d1e9db74066bcc3e168ac0
 2015-06-26 14:28:12 -07:00
Abodunrinwa Toki
0e5c603192 TextView: add the "Share" accessibility action. 
Bug: 21891817
Change-Id: I99b7489845b2103c18fd74d15d0050c34f37ca67
 2015-06-26 14:25:15 -07:00
Mady Mellor
450176c52c Merge "Fix: Text selection handles shouldn't be shown in accessibility mode" into mnc-dev 2015-06-26 21:21:56 +00:00
Alex Klyubin
e1cf75833b Merge "Don't offer crypto ops for public keys of trusted cert entries." into mnc-dev 2015-06-26 21:20:23 +00:00