196178 Commits

Author SHA1 Message Date
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
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
George Mount
3ebcd8654d Merge "Fix endTransition index out of bounds exception." into mnc-dev 2015-06-26 21:18:57 +00:00
George Mount
7a0f54b140 Merge "Fix addTarget not limiting to the given views." into mnc-dev 2015-06-26 21:18:39 +00:00
Prashant Malani
b3d02465f8 am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
* commit '9a3eacbe9ce0e6a65429c721b6f4e60a28dbdaab':
  Revert "Always re-establish kernel alarms when considering new alarm set"
2015-06-26 21:12:49 +00:00
Nicolas Prevot
b683019745 Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService.
Without this fix:
When starting an activity that was an activity-alias, in the work profile:
If this activity was already running, it caused the activity to be
created a second time instead of restarting the first one.

BUG:21411331

Change-Id: Ieb323885c589caed2675765cd5eed8c311535b92
2015-06-26 14:07:39 -07:00
Christopher Tate
1c3b7a6de6 Merge "Use a framework resource to name a factory-default browser app" into mnc-dev 2015-06-26 21:05:27 +00:00
Jim Miller
63ec93d570 Merge "Have FingerprintService keep the device awake on relevant events." into mnc-dev 2015-06-26 21:01:24 +00:00
Ying Wang
45f143fe48 Merge "Remove the obsolete LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES" into mnc-dev 2015-06-26 21:01:03 +00:00
Prashant Malani
9a3eacbe9c Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev 2015-06-26 21:00:11 +00:00
Ying Wang
559ea2fd8c Remove the obsolete LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES
Change-Id: I08c2439bcab934e23c697b93aec47b2c7bcba037
2015-06-26 13:51:18 -07:00
Christopher Tate
db3fe81990 Use a framework resource to name a factory-default browser app
If there is no resource-named default but there is a single factory-
installed browser app, that app is made the titular default.

This also introduces a permission guard on attempts to set the
default browser or the app-link state.  These operations are now
contingent on the existing SET_PREFERRED_APPLICATIONS permission.

Bug 21778406

Change-Id: Id099bb9c4141f28917546492657cd2fba472e6b6
2015-06-26 13:48:33 -07:00
Robin Lee
cd7ceb0711 Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev 2015-06-26 20:44:57 +00:00
Adam Powell
6356d3b250 Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev 2015-06-26 20:35:37 +00:00
Amith Yamasani
2433655565 Merge "Clarify the intention of setNotificationsShown" into mnc-dev 2015-06-26 20:34:33 +00:00
Svet Ganov
6cbf792833 Merge "Revert get accounts permission to normal for now" into mnc-dev 2015-06-26 20:30:36 +00:00
Dianne Hackborn
7c5b5f713a Merge "Fix issue #22023824: Download folder is not created in internal storage" into mnc-dev 2015-06-26 20:30:21 +00:00
Chris Craik
f8d25ea8eb Merge "Don't promote functors onto layers due to outline rect clipping" into mnc-dev 2015-06-26 20:28:36 +00:00
Dianne Hackborn
ca8e6da41c Fix issue #22023824: Download folder is not created in internal storage
The media provider and some other things need to be given storage access.

Also, seems like we should give storage access to the camera app as well.

And add a dump dump command that will dump data about a particular
permission name.

Change-Id: Idaaa9bba2ff4dc95290cf6d17e5df933df91e909
2015-06-26 13:28:29 -07:00
Shirish Kalele
c7a38ef840 Mark a connection as a Wifi Assistant connection based on the
ephemeral flag in WifiInfo.
Add this private field to WifiInfo.

Change-Id: Ic815b87a24e8272faa6e9e820b8fa55224af882a
2015-06-26 13:05:22 -07:00
Robert Schaub
cf05e31866 am 2a1be1bc: Docs: Added declaration to code fragment Bug: 21030774
* commit '2a1be1bc387a97e86dac4d77d269d07eff71de41':
  Docs: Added declaration to code fragment Bug: 21030774
2015-06-26 20:00:51 +00:00
Eino-Ville Talvala
daee1e5bde Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev 2015-06-26 19:53:30 +00:00
Rich Slogar
66502afb0f docs: manifest merger updates
Change-Id: I0a1c311ba08077b15ee1823146773b7d07162dd4
2015-06-26 12:45:24 -07:00
Nathan Harold
748e9d5979 Deprecate TelephonyManager.getNeighboringCellInfo()
bug: 22121990
Change-Id: Id8f9d080fdd1e2993b414a5304424238396b6fd4
2015-06-26 12:20:58 -07:00
Craig Lafayette
3cc72bab48 Hide MIME_TYPE_PROVISIONING_NFC_V2
Bug: 21918725
Change-Id: I33d67ff8f7b47ab53cff8a2664d342caf9d6e03f
2015-06-26 14:27:06 -04:00
Chien-Yu Chen
161a76cae4 Camera2: Remove references to sync.frameNumber
sync.frameNumber is a hidden key.

Bug: 21957397
Change-Id: I3b235d776782a8441354ee24c9174ae30e074a61
2015-06-26 11:23:55 -07:00
Robert Greenwalt
22b4c6a027 Add Validation logging.
Persist the last 20 lines of validation info for the last 10
networks.

bug: 21599856
Change-Id: I8124480cc9181eea2adb7eb6eabcd07c9506b6d3
2015-06-26 11:12:39 -07:00
Robert Schaub
2a1be1bc38 Docs: Added declaration to code fragment
Bug: 21030774

Change-Id: Ic906454b20ec9606e5ca11a0fbd0388492eecf42
2015-06-26 11:11:19 -07:00
Eric Laurent
5da8ed1623 Merge "AudioManager: optimize audio port listener registration" into mnc-dev 2015-06-26 17:43:03 +00:00
Mady Mellor
29f37e1597 Merge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev 2015-06-26 17:38:08 +00:00
Robin Lee
63204eeafe SystemUI: show owner VPN for restricted profile
Restricted profiles don't have their own VPN configuration - whatever
is in charge of VPN for our USER_OWNER user will have network traffic
routed to it instead.

Bug: 18419023
Bug: 21188177
Change-Id: I7205d90032461c240048a036606c3a7938d0eda2
2015-06-26 10:35:25 -07:00
Amit Mahajan
791dd2c674 DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:37 +00:00
Amit Mahajan
90224355cd DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:27 +00:00
Mady Mellor
10f9251736 Merge "Text selection: Fix word boundaries for languages without spaces" into mnc-dev 2015-06-26 17:33:22 +00:00
Wei Liu
8346722850 am 6f6326bc: Implement a exponential backoff for NTP time and XTRA data retry.
* commit '6f6326bc75be652a0b88b73fd6e0b73dbe2fabb6':
  Implement a exponential backoff for NTP time and XTRA data retry.
2015-06-26 17:33:16 +00:00
Svet Ganov
a508bf8ba2 Revert get accounts permission to normal for now
Change-Id: I51efe557b69a50d85dc53ba7a1622b7bafc301e6
2015-06-26 10:25:02 -07:00
Dianne Hackborn
ff81025a9d Merge "Fix issue #22013372: Assist should take translationX and friends..." into mnc-dev 2015-06-26 17:20:12 +00:00
Eric Laurent
c573bc5d3d AudioManager: optimize audio port listener registration
In order to reduce the number of binder calls, only install an
audio port callback in a client process if either:
- an audio port related API has been called once
- an audio port listenr has been registered.

Bug: 22045560.
Change-Id: I0e5cf31bec0c986d6f7761891b860ba6fadd2f4c
2015-06-26 10:01:12 -07:00
Mady Mellor
011a42dee7 Fix: Text selection handles shouldn't be shown in accessibility mode
If you select some text normally while in accessibility mode, it
should be cleared and handles should not show if you initiate text
selection using the accessibility context menu.

Bug: 22071639
Change-Id: I32b966e771ba5715a0ab370e6aa602398e5ec534
2015-06-26 09:51:35 -07:00
Kenny Guy
ea864c4d4d Deprecate APIs for admin to create users.
Bug: 21921868
Change-Id: I956d24a8394d95bf975581a3451ceabe01708a10
2015-06-26 16:46:01 +00:00
Jeff Sharkey
d2c4145732 Merge "Let's reinvent storage, yet again!" into mnc-dev 2015-06-26 15:43:31 +00:00