52447 Commits

Author SHA1 Message Date
Mike J. Chen
a565754a81 Merge "Update default android boot animation png files" 2014-06-10 00:55:07 +00:00
Mike J. Chen
784184e75d Update default android boot animation png files
Bug 15143975

Change-Id: I11c9f43aaec4ebff9d291084fc8f997f15c46ddd
Signed-off-by: Mike J. Chen <mjchen@google.com>
2014-06-09 15:54:00 -07:00
vandwalle
6123315ad4 Merge "remember and report network score" 2014-06-09 22:30:26 +00:00
vandwalle
2ab9089dfa remember and report network score
Change-Id: Iccb2ec603bc9c0d3cf1976d0cc3f343cb1096494
2014-06-09 14:50:47 -07:00
Jeff Brown
a2f61a39ea Merge "Add @SystemApi annotation to internal permissions." 2014-06-09 21:05:43 +00:00
Daniel Sandler
d343aff26d am e7078cf9: Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
* commit 'e7078cf9c41f5e3581a80b2129ae77719b0f69a4':
  Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
2014-06-09 19:28:56 +00:00
Julia Reynolds
dc920984f2 Merge "Allow profile and device owners to change and get the master volume mute state." 2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad Allow profile and device owners to change and get the master volume mute state.
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
2014-06-09 14:18:01 -04:00
Wonsik Kim
32c67ee119 am 8be96a6f: Merge "Make TvInputs aware of whether it\'s hardware-based or not" into lmp-preview-dev
* commit '8be96a6ffa5ce1783310fe490f615ff323d1d5ed':
  Make TvInputs aware of whether it's hardware-based or not
2014-06-09 17:44:37 +00:00
Ed Heyl
c852fdca39 Merge "merge 4ce22057, regen api/current.txt" 2014-06-09 17:43:00 +00:00
Ed Heyl
5adb67d4ce merge 4ce22057, regen api/current.txt
Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
2014-06-09 10:41:21 -07:00
Kristian Monsen
ab4bb06bec Merge "Update ViewLocationHolder#compareTo to properly implement Comparable" 2014-06-09 17:38:02 +00:00
Julia Reynolds
03f5ff482e Merge "Unhide UserManager.hasUserRestriction()." 2014-06-09 17:21:37 +00:00
Jay Civelli
9d46e3ea4f Merge "Adding a method to know if there is a connection to a BluetoothDevice." 2014-06-09 17:05:51 +00:00
Daniel Sandler
01df1c680a Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
It sprouts an additional INTENT_ prefix to distinguish it
from the Notification.category constants in the same file.

Bug: 15022240
Change-Id: Icbc09bfc5ce78964272def66934fe4a7c848e12b
2014-06-09 16:53:51 +00:00
Dianne Hackborn
e294f40b1d am 50bfc3ac: Merge "[system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close"
* commit '50bfc3ac0fadbb5413e9de07141d1eff4fc7321e':
  [system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close
2014-06-09 15:55:18 +00:00
Robin Lee
a54c8246a5 am 0b889cd6: am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit '0b889cd66fdb739a8078fb50212501849e35eb1e':
  Choose CA certificate storage according to userId
2014-06-09 14:47:04 +00:00
Jessica Hummel
f89fa83374 Merge "Update documentation so it meets api requirements" 2014-06-09 13:55:19 +00:00
George Mount
446956f789 Merge "Capture right/bottom of images properly when doing Activity Transitions." 2014-06-09 13:50:14 +00:00
Nicolas Prevot
e8b8f99dde Merge "Updating documentation for the flags of addCrossProfileIntentFilter" 2014-06-09 13:01:09 +00:00
Robin Lee
0b889cd66f am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId
2014-06-09 12:55:13 +00:00
Jason Monk
1e7bdd7174 Merge "Add an API to clear the device owner." 2014-06-09 12:48:35 +00:00
Robin Lee
3d076afc37 Choose CA certificate storage according to userId
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.

This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.

Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
2014-06-09 12:45:17 +00:00
Yohei Yukawa
0fcedfd8ea Merge "Introduce a sequence number to avoid redundant IPCs" 2014-06-09 12:02:30 +00:00
Jessica Hummel
9da603973b Update documentation so it meets api requirements
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443
2014-06-09 13:01:03 +01:00
Nicolas Prevot
41d926e3e4 Updating documentation for the flags of addCrossProfileIntentFilter
Change-Id: I32ed07aecdc8009cbb5708777da5085feabfd4ef
2014-06-09 11:55:23 +01:00
Calin Juravle
66e29d08c7 am ee20e16d: am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."
* commit 'ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d':
  Fixed comments related to profile properties.
2014-06-09 10:05:04 +00:00
Adam Connors
89b3b4a0b2 API Review: rename FEATURE_MANAGEDPROFILES
To be FEATURE_MANAGED_PROFILES

Bug: 15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
(cherry picked from commit 687efd6f5c05dc1e4a9c284bf3edae901af45942)
2014-06-09 10:58:22 +01:00
Calin Juravle
ee20e16d7b am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."
* commit '337f97bedc09354ea9a8a506aefccc39dd4248e8':
  Fixed comments related to profile properties.
2014-06-09 09:56:37 +00:00
Yohei Yukawa
3d1e8129eb Introduce a sequence number to avoid redundant IPCs
This CL introduces a sequence number to avoid redundant IPCs
between IMM and IMMS. The basic concept is that:
1. IMMS maintains a sequence number for #notifyUserAction.
2. IMMS increases the sequence number whenever the current
   IME/subtype is changed.
3. IMMS notifies the new sequence number to IMM.
4. IMM maintains the last sent sequence number and the next
   sequence number. IMM should call #notifyUserAction only
   once per particular sequence number.
5. IMMS ignores #notifyUserAction if the specified sequence
   number is not the expected one.

BUG: 7043015
Change-Id: I19ad8542659bc092b92ee13eb9f1d68ddd4b815a
2014-06-09 18:30:02 +09:00
Calin Juravle
de99f08f65 Fixed comments related to profile properties.
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
2014-06-09 10:13:55 +01:00
Wonsik Kim
55f933f715 Merge "Make TvInputs aware of whether it's hardware-based or not" into lmp-preview-dev 2014-06-09 06:07:21 +00:00
Jinsuk Kim
f43cea0094 Merge "Remove HdmiCecService" into lmp-preview-dev 2014-06-09 01:13:29 +00:00
Robert Greenwalt
cc62d9ad6b Merge "Apply API review to android.net.Network:" 2014-06-08 23:41:27 +00:00
Jinsuk Kim
3f48068d78 Remove HdmiCecService
The service is replaced with HdmiControlService. Removing all the related
classes and the initialization of the service.

Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
2014-06-09 07:55:47 +09:00
Robert Greenwalt
df2b878ff4 Fix public API of LinkProperties.
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
2014-06-08 12:54:23 -07:00
Paul Jensen
6d3ff9ea3a Apply API review to android.net.Network:
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
2014-06-08 12:09:18 -07:00
Robert Greenwalt
915c8d5841 Merge "Fix the marking of restricted network requests" 2014-06-08 16:07:40 +00:00
Dianne Hackborn
000cdd5fe5 Merge "[system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close" into lmp-preview-dev 2014-06-07 17:33:18 +00:00
Igor Murashkin
09c0d2618c am f6c66902: Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev
* commit 'f6c66902392ae7fcfd44fe90fc43b08b21db2e10':
  util: Make Rational a Number/Comparable; add Range#inRange
2014-06-07 12:26:23 +00:00
Todd Poynor
c42ef37e28 am 1be0bda2: Merge "BatteryManager: battery property query API update" into lmp-preview-dev
* commit '1be0bda27ef001c41f4d4361f079eb5ca6592b04':
  BatteryManager: battery property query API update
2014-06-07 10:01:10 +00:00
Wonsik Kim
af743eeaec Make TvInputs aware of whether it's hardware-based or not
Bug: 15326724
Change-Id: I1f418150ba29ee50afc50a811198115fdc6f9c42
2014-06-07 13:36:19 +09:00
Nick Kralevich
82b3201a95 resolved conflicts for merge of 13ed83ee to master
Change-Id: Ia3739cfa7af60e6a47bf94d403df190f3f2cd082
2014-06-06 21:13:28 -07:00
Baligh Uddin
7892a49615 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:36 +00:00
Baligh Uddin
d29b822d9b Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:29 +00:00
Ari Sachter-Zeltzer
7e3357a56d [system transitions]
+ merge all transition work into new branch for commiting to master
+ new task switching animations to support doc-centric recents
+ new default activity transitions
+ new app -> home (wallpaper close)
+ updated fragment close

Change-Id: If055e454e7e7bf11c7d54c8cacad8f7ec52d12d1
2014-06-06 19:48:36 -07:00
Jeff Brown
b61eaaac59 Add @SystemApi annotation to internal permissions.
This is a first pass at annotating permissions that should not be
granted or used by to third-party apps but that may be required by
privileged system applications.  For this patch, the annotation was
only added to permissions that have a protection level of at least
system.  Signature-only permissions were left alone since they only
need to be visible to built-in components.

Change-Id: I189472028274c133793ad8e4068585c536dd7f38
2014-06-06 19:46:26 -07:00
Igor Murashkin
2f98a26bbf Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev 2014-06-07 00:35:36 +00:00
Igor Murashkin
007bfb14d2 util: Make Rational a Number/Comparable; add Range#inRange
* Also changes Rational to reduce the numerator/denominator by
its greatest common divisor at construction time (e.g. (2/4 -> 1/2)).

Bug: 15432042
Change-Id: Ib827abccf44a040667e5931cf9442afc86b57e2d
2014-06-06 16:38:09 -07:00
Todd Poynor
407a403402 Merge "BatteryManager: battery property query API update" into lmp-preview-dev 2014-06-06 23:16:16 +00:00