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

138551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Civelli
abc40bbeeb Temporary removing the Trust Agent permission change. 
Removing the permission check for Trust Agents, until the GMS core prebuilt
has that permission.

BUG: 15546358

Change-Id: Id42d3820d8d772b7788ea1f7431944bf13d4cc92
 2014-06-11 09:19:15 -07:00
Ed Heyl
f914a89073 fix conflict markers 
Change-Id: I0b95da6a8cb461dfaf7db026b6d190e2dcbe6935
 2014-06-09 10:59:22 -07:00
Adam Connors
b6d305ecf4 am ef4dfabe: API Review: rename FEATURE_MANAGEDPROFILES 
* commit 'ef4dfabe22df2ce86cdf732c4a27ce8dcd8fad51':
  API Review: rename FEATURE_MANAGEDPROFILES
 2014-06-09 17:44:50 +00:00
Ji-Hwan Lee
8d396392cc am 9a904962: Merge "Set mBound only when bind succeeds" into lmp-preview-dev 
* commit '9a9049626d214a6329090abbba8e067ef3005c2e':
  Set mBound only when bind succeeds
 2014-06-09 17:44:43 +00: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
Jinsuk Kim
4d93ea5bb3 am 2a7a13e4: Merge "Remove HdmiCecService" into lmp-preview-dev 
* commit '2a7a13e4a18803b8527deca0b6ca29b6e326671f':
 2014-06-09 17:44:35 +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
Elliott Hughes
f928103269 am ef00c16d: am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit 'ef00c16d62cf2217c44658ad9894810322551d28':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:37:31 +00:00
Elliott Hughes
ef00c16d62 am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit 'de1f00231f23937de41e671be987475fbdf9afc9':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:33:39 +00:00
Elliott Hughes
de1f00231f am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit '2a1ed46decbc8e21a39367a4b7770111392167c3':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:30:03 +00:00
Elliott Hughes
2a1ed46dec Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 2014-06-09 16:26:28 +00:00
Elliott Hughes
e0f2fa33d7 Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt. 
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
 2014-06-09 09:22:58 -07:00
Dongwon Kang
0a5b778495 am c523b768: Merge "Make TvView keep the volume value and set later once the connecation is made." into lmp-preview-dev 
* commit 'c523b768331f8e3e1d355dd688f47946702cb425':
  Make TvView keep the volume value and set later once the connecation is made.
 2014-06-09 15:55:56 +00:00
Bryan Mawhinney
aa00ae0a67 am 99017c01: Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev 
* commit '99017c01bac525ca4b5b10768052ced398b4a493':
  Fix issue preventing aapt from stripping all unwanted densities
 2014-06-09 15:55:43 +00:00
Deepanshu Gupta
75814c19d3 am e23620e6: Merge "Build LayoutLib with Java 6" into lmp-preview-dev 
* commit 'e23620e684ae73558e42a51f93004c8de07ba8d5':
  Build LayoutLib with Java 6
 2014-06-09 15:55:24 +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
Robin Lee
db9e0a674a am 01c07a85: Merge "Choose CA certificate storage according to userId" 
* commit '01c07a856de163dc9a6fd31ea4b42293d221ee63':
  Choose CA certificate storage according to userId
 2014-06-09 12:51:19 +00:00
Jason Monk
1e7bdd7174 Merge "Add an API to clear the device owner." 2014-06-09 12:48:35 +00:00
Robin Lee
01c07a856d Merge "Choose CA certificate storage according to userId" 2014-06-09 12:47:08 +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
337f97bedc am 97f7f24c: Merge "Fixed comments related to profile properties." 
* commit '97f7f24c9d9ea35a2e360fb86beb0a9fca4fc2d7':
  Fixed comments related to profile properties.
 2014-06-09 09:23:18 +00:00
Calin Juravle
97f7f24c9d Merge "Fixed comments related to profile properties." 2014-06-09 09:18:23 +00:00
Calin Juravle
de99f08f65 Fixed comments related to profile properties. 
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
 2014-06-09 10:13:55 +01:00
Ji-Hwan Lee
8719611744 Merge "Set mBound only when bind succeeds" into lmp-preview-dev 2014-06-09 08:16:07 +00:00
Ji-Hwan Lee
e17b2dd7bc Set mBound only when bind succeeds 
Fixes an issue that TV input is disabled forever after package upgrade,
when it's upgraded while in use.  The root cause is as below:

- Package is killed while upgrade.
- Service disconnects, and tries to rebind for reconnecting, but bind fails
  because service is not available temporarily.  Still ServiceState.mBound is
  set to true.
- Should rebind next when callback is registered or new session is created,
  but doesn't because ServiceState is already marked bound.

Bug: 14981201
Change-Id: Ia5b0acb33f1247064213024438f114bc40238648
 2014-06-09 15:22:59 +09: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
Dongwon Kang
ba4b432286 Merge "Make TvView keep the volume value and set later once the connecation is made." into lmp-preview-dev 2014-06-08 23:40:20 +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
Bryan Mawhinney
2386bd5de4 Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev 2014-06-08 17:03:04 +00:00
Robert Greenwalt
915c8d5841 Merge "Fix the marking of restricted network requests" 2014-06-08 16:07:40 +00:00