Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
207,521 Commits 3 Branches 0 Tags
fd166329be9fa223bb28ebfef53c73fe4bb50143
Commit Graph

28770 Commits

Author SHA1 Message Date
Chris Tate
dbcba09295 am 6baa88d5: am 87c3a63c: am 73c8a19d: am 5a626722: am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev 
* commit '6baa88d5d35756f5141dd3dd684255ea4d0d2a16':
  Fix a bug disappearing installerPackageName info of packages after reboot.
 2015-07-16 02:31:18 +00:00
Chris Tate
6baa88d5d3 am 87c3a63c: am 73c8a19d: am 5a626722: am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev 
* commit '87c3a63c0c557ce4be5021733d8d4ae21cc0c3c0':
  Fix a bug disappearing installerPackageName info of packages after reboot.
 2015-07-16 02:13:17 +00:00
Christopher Tate
a0bfc20635 am fdb71b60: am 374600c9: am 49af7ad4: am fbb4e9d2: am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 
* commit 'fdb71b6041c7e4eba0410116799b276ab8ab83c5':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-16 01:32:04 +00:00
Billy Lau
dd46de68ad am 1178526c: am 0d360d17: am fa2584f6: am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '1178526c352a6784b520cd10a3a5686f9427d1b9':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 01:31:56 +00:00
Chris Tate
5a6267226e am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev 
* commit 'a36c5580c503da98c137c5bf9f52a719a131d2a9':
  Fix a bug disappearing installerPackageName info of packages after reboot.
 2015-07-16 01:28:59 +00:00
Chris Tate
a36c5580c5 Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev 2015-07-16 01:18:06 +00:00
Christopher Tate
fdb71b6041 am 374600c9: am 49af7ad4: am fbb4e9d2: am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 
* commit '374600c93578ebdfc139e65ac6fb26c988b88d27':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-16 01:13:24 +00:00
Billy Lau
1178526c35 am 0d360d17: am fa2584f6: am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '0d360d17a4307f32f3179ade4d3730d0a02d227d':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 01:13:18 +00:00
Dianne Hackborn
0bc31f6d73 am b876fb5a: am d649b575: am f9aa4b4d: am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit 'b876fb5aef80cb9cf4143c32a473afaa0b6f885e':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-16 00:40:29 +00:00
Dianne Hackborn
bebf8b3116 am cd917ecf: am 18587c55: am b5c44f90: am 709d013f: am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev 
* commit 'cd917ecf0abb011916e9d90f526a2eff454bc1e7':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)
 2015-07-16 00:40:19 +00:00
Jim Miller
2fcb90f397 am 04bcd224: am 0483200d: am baa370e1: am db19e1de: Merge "Fix the build" into mnc-dr-dev 
* commit '04bcd224ffcb5c8978ae47492ee692650b72a84c':
  Fix the build
 2015-07-16 00:39:48 +00:00
Christopher Tate
fbb4e9d23f am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 
* commit '3b1f8607fdc416a87e608499698719f3234ecc90':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-16 00:31:18 +00:00
Dianne Hackborn
b876fb5aef am d649b575: am f9aa4b4d: am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit 'd649b5751c9b7f592efb3653cfee39aeda45677b':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-16 00:24:41 +00:00
Dianne Hackborn
cd917ecf0a am 18587c55: am b5c44f90: am 709d013f: am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev 
* commit '18587c5511ce3304070d5ac77c112fccdde68e3b':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)
 2015-07-16 00:24:35 +00:00
Jim Miller
04bcd224ff am 0483200d: am baa370e1: am db19e1de: Merge "Fix the build" into mnc-dr-dev 
* commit '0483200dc3c6345487fce09bf8ecaf34b0af89ee':
  Fix the build
 2015-07-16 00:24:10 +00:00
Christopher Tate
29c0a82395 am a9fa3c24: am b3ed2b8b: am ec0ed98d: am b6b97e90: am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev 
* commit 'a9fa3c24e0f013a345be935179579706f67d1f6c':
  Resolve based on the correct user's default browser
 2015-07-16 00:21:55 +00:00
Billy Lau
da93454bfa am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '008409a2ea1feed095d53ce51429e4fed964c50c':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 00:21:44 +00:00
Christopher Tate
3b1f8607fd Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 2015-07-16 00:21:12 +00:00
hyemin.hwang
b4faf9810d Fix a bug disappearing installerPackageName info of packages after reboot. 
If user install apps from playstore, system has installerPackageName attribute of app.
but, after reboot, some apps(have sharedUserID) installerPackageName attribute disappearing.
because lack of copy routine.
So, I added copy routine(installerPackageName).

Testcase :
1. Install app(has sharedUserId, ex Lync2013) from market.
2. Confirm package info from packages.xml(exist installer info).
3. reboot.
4. Re-confirm package info from packages.xml(not exist installer info).

Cherry-pick from AOSP master.
Bug 22513758

Change-Id: I3fea3e573c056f6c2f574715d2ebef4df8b75a68
 2015-07-15 17:14:24 -07:00
Christopher Tate
a9fa3c24e0 am b3ed2b8b: am ec0ed98d: am b6b97e90: am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev 
* commit 'b3ed2b8b6facfb512de5a2c4ad81ea5c5736d0a8':
  Resolve based on the correct user's default browser
 2015-07-16 00:05:07 +00:00
Billy Lau
008409a2ea Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-16 00:04:35 +00:00
Christopher Tate
ac15b1b0c0 Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
Bug 22504009

Change-Id: I565b2ba4d1e5deeee8ede3363819deec206dbf58
 2015-07-15 16:56:58 -07:00
Dianne Hackborn
309f9d6e7f am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit 'f6586cbde7d4612963eb2e8a2413235630676b83':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-15 23:39:32 +00:00
Dianne Hackborn
709d013fd6 am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev 
* commit '67e02e60ca58db95b397fde7bfeeebb012e8aff8':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)
 2015-07-15 23:39:27 +00:00
Billy Lau
060275ffc7 Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW... 
AppOpsManager:
Changed the default mode for SYSTEM_ALERT_WINDOW to MODE_DEFAULT instead of
MODE_ALLOWED. Otherwise, an app that did not declare for this permission will
actually be allowed to perform OP_SYSTEM_ALERT_WINDOW, which is undesirable.
This change also allows callers to make their own decision based on the
current policy (M vs pre-M apps).

policy/PhoneWindowManager:
Added additional checks that will handle MODE_DEFAULT - this happens when an app
is newly installed but not yet configured.

wm/WindowManagerService:
Enriched some checks to include the treatment of MODE_DEFAULT - this will allow
pre-M apps uninterupted capability to draw on top of other apps.

Change-Id: I8de77730e158c97587427820cfba721bd5607bea
 2015-07-16 00:34:26 +01:00
Jim Miller
db19e1ded0 Merge "Fix the build" into mnc-dr-dev 2015-07-15 23:32:39 +00:00
Svet Ganov
5dc71cb2dd am ffb43184: am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit 'ffb4318447f7741b4901dd38e3f6d97c94794b42':
  Grant default permissions to the setup app robustly.
 2015-07-15 23:32:14 +00:00
Dianne Hackborn
f6586cbde7 Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 2015-07-15 23:31:25 +00:00
Dianne Hackborn
67e02e60ca Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev 2015-07-15 23:31:02 +00:00
Jeff Brown
4085a74b4c am 209c8ced: am 6e4997db: am 8bdd92d4: am 0cb1cfdc: am 76c4c666: Add USB port manager. 
* commit '209c8cedab87359564c032a3e56b3acd452e1ac9':
  Add USB port manager.
 2015-07-15 23:30:28 +00:00
Jeff Brown
a50dfe9c6f am 852e51e2: am 3bc33423: am b35b8e81: am b3c11805: am 2dbccc19: Clean up USB Manager dump. 
* commit '852e51e23de4dd390f81f5c5a45687595323599a':
  Clean up USB Manager dump.
 2015-07-15 23:30:20 +00:00
Jim Miller
de5b573e2a Fix the build 
Build broken due to a bad merge.

Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544
 2015-07-15 16:29:30 -07:00
Svet Ganov
ffb4318447 am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit '3d8e949a7767b204eb9504d3c5267de9e0fd6899':
  Grant default permissions to the setup app robustly.
 2015-07-15 23:18:40 +00:00
Jeff Brown
209c8cedab am 6e4997db: am 8bdd92d4: am 0cb1cfdc: am 76c4c666: Add USB port manager. 
* commit '6e4997dbfb5f0a2abac99522a52b557172757ee2':
  Add USB port manager.
 2015-07-15 23:16:55 +00:00
Jeff Brown
852e51e23d am 3bc33423: am b35b8e81: am b3c11805: am 2dbccc19: Clean up USB Manager dump. 
* commit '3bc33423477945a0f97ebe7948af642cc56cea7b':
  Clean up USB Manager dump.
 2015-07-15 23:16:45 +00:00
Christopher Tate
b6b97e90cb am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev 
* commit '06476508c4aae6b9bb5affdc7470abf159ef9eda':
  Resolve based on the correct user's default browser
 2015-07-15 23:12:59 +00:00
Christopher Tate
06476508c4 Merge "Resolve based on the correct user's default browser" into mnc-dev 2015-07-15 22:57:53 +00:00
Jim Miller
aa1a35ba27 am 2e56339a: am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit '2e56339a4a1133e9aface1c851f1ab67cff72109':
  Improve tracking of screen on reasons.
 2015-07-15 22:40:32 +00:00
Svet Ganov
12b05ec2e7 am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit '75f6b94a5d5cadb218725011729466e8e438b231':
  Grant default permissions to the setup app robustly.
 2015-07-15 22:28:10 +00:00
Jeff Brown
0cb1cfdcc3 am 76c4c666: Add USB port manager. 
* commit '76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
  Add USB port manager.
 2015-07-15 22:26:38 +00:00
Jeff Brown
b3c1180538 am 2dbccc19: Clean up USB Manager dump. 
* commit '2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
  Clean up USB Manager dump.
 2015-07-15 22:26:34 +00:00
Jim Miller
2e56339a4a am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit 'bcedcde8093b48c3d013cc57dde42bdd17d6dcb9':
  Improve tracking of screen on reasons.
 2015-07-15 22:26:05 +00:00
Svet Ganov
75f6b94a5d Merge "Grant default permissions to the setup app robustly." into mnc-dev 2015-07-15 21:58:50 +00:00
Christopher Tate
7991f7813e Resolve based on the correct user's default browser 
Bug 22509659

Change-Id: Iac75e7b40609bf2c81d266e0568fbfbeb71bb3aa
 2015-07-15 14:52:29 -07:00
Svet Ganov
50a8bf4da0 Grant default permissions to the setup app robustly. 
There is a zoo of components that handle the home intent and
have different priority. There is no reliable way to distinguish
the setup app from the other apps that handle home as some of
them have lower priority than the setup app and some higher.
This change adds a dedicated category to recognize the default
setup app.

Uncommented the code that grants accounts permissions as the
get_accounts permission is now a runtime permission and can be
granted.

bug:22471024
bug:22501463

Change-Id: I41726751fa2567cbcd7d09c7acfa7615b8aba577
 2015-07-15 14:46:23 -07:00
Jim Miller
c7b0435cc7 resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
 2015-07-15 14:33:10 -07:00
Dianne Hackborn
1de1186d28 Implement issue #22403908: Enable assistant to refuse context sharing 
New APIs allow the voice interaction service to set/retrieve a filter
for which of the show flags are allowed.

Change-Id: I588cbe55afee0548ad3afa22d3a7d3bc43cb54a6
 2015-07-15 14:20:51 -07:00
Jeff Brown
76c4c6668a Add USB port manager. 
Add some new internal APIs to enumerate USB Type C ports, query their
status, determine whether they support changing power or data roles,
and doing so.  The API also adds a new ACTION_USB_PORT_CHANGED broadcast
for port state changes.

The implementation includes a mechanism for simulating the behavior
of the USB stack.  See 'adb shell dumpsys usb -h' for details.

Note that the underlying kernel driver interface is still subject
to change but its behavior has been encapsulated as much as possible.

Bug: 21615151
Change-Id: I0c853ae179248a4550b3e60d02a7a7e65e4546b2
 2015-07-15 11:34:29 -07:00
Jeff Brown
2dbccc1926 Clean up USB Manager dump. 
Tidy up the dump() implementation in preparation for further work.

Bug: 21615151
Change-Id: If6d94c8dc9457b8e93103541ec1798981eeb5b54
 2015-07-15 11:34:29 -07:00
Dianne Hackborn
16f3671620 Fix issue #22487155: Device unresponsive (deadlock in system_server) 
Using my magic potion, Deadlock-B-Gone!

Change-Id: If5c0a2b18134dc95444f3782ab5aa475414b5839
 2015-07-15 11:32:32 -07:00